gentoo resync : 08.01.2021

4 files changed, 3 insertions, 347 deletions

diff --git a/mail-filter/mapson/Manifest b/mail-filter/mapson/Manifest
index 7fa6363b460b..dd88d892b1c9 100644
--- a/mail-filter/mapson/Manifest
+++ b/mail-filter/mapson/Manifest
@@ -1,7 +1,4 @@
-AUX mapson-3.3-gcc6.patch 10368 BLAKE2B 8c00a3030276c78e09406e4b8fcbab1cccae183af09c8c2dfa31fecbd7673a1a6008c73ce8e872920f34700816d3095fde35a771e9bfe3196b2c8a6dcbc9a869 SHA512 159e5a3e4b7fafe0b1c12e020c9c37bfefa40218fe2d974a263060eb27b1afebff4215d03a574e6487f36a61fc71f19b1bdc69ce4234095a9bc6a8fdc173f1e7
 AUX mapson-3.3-respect-AR.patch 282 BLAKE2B 56dba922efc554e634ead5e8d155019507c085e757d10917c24469b9d0d522589c23091eabaa1d8353c509a42c27067b2f1044ce77a95465955e6f498cbe70f7 SHA512 c34a84a995bfb7fd6f7fb1c1f80d30a41caa6e9e0729e9498b46d6586c743cef72e36c4bd8c9a3d94879fea6c8cbd23c00a81442077e2df946d7df53778f820b
 DIST mapson-3.3.1.tar.gz 553101 BLAKE2B 5100029e4b650b63cf868de48d9c709ac9fa8dcf773adb9ab70061756604116d69a20421d96ca769e19047efbe806cfc63432269cc83133f7f7f54f71b627d45 SHA512 07ecfdd2f9857a8b3818d065e4c342fda5089b77074ea153f9a380fe655716a214ff06f79eebe768b2470724e11a6ee819c1e457a47670c07537d6fd226dc1db
-DIST mapson-3.3.tar.gz 421820 BLAKE2B e12c358113452a426cd5b55b945b77a303b595362064f6c84fe8bd8799502dd72872ca46cf54ce04022c3d27be52a849e337ae149521ce6ca35e990be73c1e98 SHA512 208d3b21d59689465a5c46619a53b3342c3ca96575d681b9ad01b1b6ffa05f05f56ab6e7ae38a8b2161e3f8d42b90b559baf8ff9db4ab4c83238d7adcb645fd0
-EBUILD mapson-3.3-r1.ebuild 988 BLAKE2B c44904bde0782277b0f9f3ff3df21b9f88329c8c33fbd03beae708a1e11bd7b8f5bb28d8cc68f9d5754072474d02fcd44dd59bef1eccdb858c22d48a2e3c2b66 SHA512 42e4b0c617ece918664bd0fd6ec1bb3d86aa2ef1137d18aa7b78d3a6c7d73fb0525e75a1bf1a2dd6173f6a85a3da944b2b8e54737ce18cfdcf7c946894650044
-EBUILD mapson-3.3.1.ebuild 955 BLAKE2B ef02280c792d82ec866cc6276b90c496934697163afa9b78af5b7b2c83e6fcb57be982134f2c7d8d918d3291aa9320879577dbf3a712aedf3b2b1724804f9edb SHA512 748842b3abd81ca8a79aa725a6162e535ec7f8194eb4557da6c54487020662abba361ccb9370224df84dc0fb20de16388e29129abc92a534c7fe14a79b7325c4
+EBUILD mapson-3.3.1.ebuild 952 BLAKE2B 1a740d359b921d460dca41a19e51babd60b34d7ea42753b6bbcd7b4055449c8453a0e6169b3c865ef5cb8c478cfb2b4464d8837f3c20e07e2129f084739c0403 SHA512 b549c12b0fc71c8f512ac09e02d8002c6944abbc879bb406b0a0fef1e8d0e3ce8d51c178ca8efb855cf819e9bd22903a0f3574601696023e29c9907d38441fe2
 MISC metadata.xml 243 BLAKE2B d67b7acc61a5bb2cbedc654940fe1fe6bee39265ea6526ce527b262efea2e79975f3652c9c56fd31d60d9539f550d91efc7efa07ebd1d3f9f91d0958c2e94f0c SHA512 5d03648b477941f83f642d119d87a9ef99740ac272bbd74cab1b2987eed7e198b3aa658ddeb0db98ee20a2ee4c21d205672290aaeace5ff4dd81e72935a110a1
diff --git a/mail-filter/mapson/files/mapson-3.3-gcc6.patch b/mail-filter/mapson/files/mapson-3.3-gcc6.patch
deleted file mode 100644
index d43c2cb95ea9..000000000000
--- a/mail-filter/mapson/files/mapson-3.3-gcc6.patch
+++ /dev/null
@@ -1,287 +0,0 @@
---- a/accept-confirmation.cpp
-+++ b/accept-confirmation.cpp
-@@ -52,7 +52,7 @@
-     for (rc = read(fd, tmp, sizeof(tmp)); rc > 0; rc = read(fd, tmp, sizeof(tmp)))
-       mail.append(tmp, rc);
-     if (rc < 0)
--      throw system_error(string("Failed to read mail file '") + filename + "'");
-+      throw mapson_system_error(string("Failed to read mail file '") + filename + "'");
-     deliver(mail);
-     unlink(filename.c_str());
-   }
---- a/address-db.cpp
-+++ b/address-db.cpp
-@@ -26,7 +26,7 @@
- 
-   fd = open(filename.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
-   if (fd < 0)
--    throw system_error(string("Can't open address db '") +
-+    throw mapson_system_error(string("Can't open address db '") +
-                       filename + "' for reading");
-   fd_sentry sentry(fd);
- 
-@@ -36,7 +36,7 @@
-   lock.l_start  = 0;
-   lock.l_len    = 0;
-   if (fcntl(fd, F_SETLKW, &lock) != 0)
--    throw system_error(string("Can't lock file '") + filename + "'");
-+    throw mapson_system_error(string("Can't lock file '") + filename + "'");
- 
-   // Read the file into memory.
- 
-@@ -47,7 +47,7 @@
-        rc = read(fd, buffer, sizeof(buffer)))
-     data.append(buffer, rc);
-   if (rc < 0)
--    throw system_error(string("Failed to read address db '") +
-+    throw mapson_system_error(string("Failed to read address db '") +
-                       filename + "' into memory");
- 
-   // Success. Don't close the file descriptor.
-@@ -107,7 +107,7 @@
-   {
-     ssize_t rc = write(fd, data.data()+len, data.size()-len);
-     if (rc < 0)
--      throw system_error(string("Failed writing to the address db '") + filename + "'");
-+      throw mapson_system_error(string("Failed writing to the address db '") + filename + "'");
-     else
-       len += rc;
-   }
---- a/config.cpp
-+++ b/config.cpp
-@@ -70,9 +70,9 @@
-     string tmp = string(name) + "=" + value;
-     char* env = strdup(tmp.c_str());
-     if (env == 0)
--      throw system_error("strdup() failed");
-+      throw mapson_system_error("strdup() failed");
-     if (putenv(env) != 0)
--      throw system_error("putenv() failed");
-+      throw mapson_system_error("putenv() failed");
-   }
- }
- 
-@@ -84,7 +84,7 @@
- 
-   pwd_sentry sentry(getpwuid(getuid()));
-   if (sentry.pwd == 0)
--    throw system_error("Can't get my user name");
-+    throw mapson_system_error("Can't get my user name");
-   log_file.assign(sentry.pwd->pw_dir).append("/.mapson/log");
-   spool_dir.assign(sentry.pwd->pw_dir).append("/.mapson/spool");
-   address_db.assign(sentry.pwd->pw_dir).append("/.mapson/address-db");
---- a/deliver.cpp
-+++ b/deliver.cpp
-@@ -31,11 +31,11 @@
- 
-     FILE* fh = popen(config->mailbox.c_str()+1, "w");
-     if (fh == NULL)
--      throw system_error(string("Can't start delivery pipe '") + config->mailbox + "'");
-+      throw mapson_system_error(string("Can't start delivery pipe '") + config->mailbox + "'");
-     int len = fwrite(mail.data(), mail.size(), 1, fh);
-     pclose(fh);
-     if (len != 1)
--      throw system_error(string("Failed to pipe to MTA process '") + config->mailbox + "'");
-+      throw mapson_system_error(string("Failed to pipe to MTA process '") + config->mailbox + "'");
-   }
-   else
-   {
-@@ -43,7 +43,7 @@
- 
-     int fd = open(config->mailbox.c_str(), O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR);
-     if (fd < 0)
--      throw system_error(string("Can't open mailbox file '") + config->mailbox + "' for writing");
-+      throw mapson_system_error(string("Can't open mailbox file '") + config->mailbox + "' for writing");
-     fd_sentry sentry(fd);
- 
-     struct flock lock;
-@@ -52,13 +52,13 @@
-     lock.l_start  = 0;
-     lock.l_len    = 0;
-     if (fcntl(fd, F_SETLKW, &lock) != 0)
--      throw system_error(string("Can't lock file '") + config->mailbox + "'");
-+      throw mapson_system_error(string("Can't lock file '") + config->mailbox + "'");
- 
-     for (size_t len = 0; len < mail.size(); )
-     {
-       ssize_t rc = write(fd, mail.data()+len, mail.size()-len);
-       if (rc < 0)
--        throw system_error(string("Failed writing to the mailbox file '") + config->mailbox + "'");
-+        throw mapson_system_error(string("Failed writing to the mailbox file '") + config->mailbox + "'");
-       else
-         len += rc;
-     }
---- a/lines2regex.cpp
-+++ b/lines2regex.cpp
-@@ -29,7 +29,7 @@
-     if (errno == ENOENT)
-       return "";
-     else
--      throw system_error(string("Can't open regex db '") +
-+      throw mapson_system_error(string("Can't open regex db '") +
-                         filename + "' for reading");
-   }
-   fd_sentry sentry(fd);
-@@ -40,7 +40,7 @@
-   lock.l_start  = 0;
-   lock.l_len    = 0;
-   if (fcntl(fd, F_SETLKW, &lock) != 0)
--    throw system_error(string("Can't lock file '") + filename + "'");
-+    throw mapson_system_error(string("Can't lock file '") + filename + "'");
- 
-   // Read the file into memory.
- 
-@@ -52,7 +52,7 @@
-        rc = read(fd, buffer, sizeof(buffer)))
-     data.append(buffer, rc);
-   if (rc < 0)
--    throw system_error(string("Failed to read regex db '") +
-+    throw mapson_system_error(string("Failed to read regex db '") +
-                       filename + "' into memory");
- 
-   // Walk through the lines and compile the regexes.
---- a/log.cpp
-+++ b/log.cpp
-@@ -30,10 +30,10 @@
-   char buf[64];
-   time_t tstamp = time(0);
-   if (tstamp == static_cast<time_t>(-1))
--    throw system_error("time(2) failed");
-+    throw mapson_system_error("time(2) failed");
-   struct tm* tmtime = localtime(&tstamp);
-   if (tmtime == 0)
--    throw system_error("localtime(3) failed");
-+    throw mapson_system_error("localtime(3) failed");
-   strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", tmtime);
-   return buf;
- }
-@@ -42,7 +42,7 @@
- {
-   fileh.file = fopen(file, "a");
-   if (fileh.file == 0)
--    throw system_error(string("Could not open log file ") + file);
-+    throw mapson_system_error(string("Could not open log file ") + file);
- 
-   struct flock lock;
-   lock.l_type = F_WRLCK;
-@@ -50,7 +50,7 @@
-   lock.l_start  = 0;
-   lock.l_len    = 0;
-   if (fcntl(fileno(fileh.file), F_SETLKW, &lock) != 0)
--    throw system_error(string("Can't lock file '") + file + "'");
-+    throw mapson_system_error(string("Can't lock file '") + file + "'");
- }
- 
- void _debug(const char* fmt, ...)
---- a/mapson.cpp
-+++ b/mapson.cpp
-@@ -62,7 +62,7 @@
- 
-       fd = open(argv[i], O_RDONLY, 0);
-       if (fd < 0)
--        throw system_error("Can't open file for reading");
-+        throw mapson_system_error("Can't open file for reading");
-       fd_sentry sentry(fd);
-       string mail;
-       for (rc = read(fd, buffer, sizeof(buffer));
-@@ -72,7 +72,7 @@
-         mail.append(buffer, rc);
-       }
-       if (rc < 0)
--        throw system_error("Failed to read from file");
-+        throw mapson_system_error("Failed to read from file");
- 
-       // Extract the mail addresses.
- 
-@@ -196,7 +196,7 @@
-     mail.append(buffer, rc);
-   }
-   if (rc < 0)
--    throw system_error("Failed to read mail from standard input");
-+    throw mapson_system_error("Failed to read mail from standard input");
- 
-   // Check whether the mail contains a valid cookie. If it does,
-   // mail will be replaced with the original e-mail, that was
---- a/parse-config-file.cpp
-+++ b/parse-config-file.cpp
-@@ -55,7 +55,7 @@
- 
-   std::ifstream file(filename);
-   if (!file)
--    throw system_error(std::string("parse_config_file() failed to open '") + filename + "'");
-+    throw mapson_system_error(std::string("parse_config_file() failed to open '") + filename + "'");
- 
-   // Now we read line by line and process each one seperately.
- 
---- a/request-confirmation.cpp
-+++ b/request-confirmation.cpp
-@@ -157,7 +157,7 @@
-   string filename = config->request_for_confirmation_file;
-   int fd = multi_open(filename, O_RDONLY, S_IRUSR | S_IWUSR);
-   if (fd < 0)
--    throw system_error(string("Can't open request-mail template file '") + filename + "' for reading");
-+    throw mapson_system_error(string("Can't open request-mail template file '") + filename + "' for reading");
-   fd_sentry sentry(fd);
- 
-   // Read the file into memory.
-@@ -167,7 +167,7 @@
-   for (rc = read(fd, buffer, sizeof(buffer)); rc > 0; rc = read(fd, buffer, sizeof(buffer)))
-     mail_template.append(buffer, rc);
-   if (rc < 0)
--    throw system_error(string("Failed to read request-mail template file '") + filename + "' into memory");
-+    throw mapson_system_error(string("Failed to read request-mail template file '") + filename + "' into memory");
- 
-   // Expand variables in the template.
- 
-@@ -180,11 +180,11 @@
-   debug(("Executing mail transport agent '%s'.", config->mta.c_str()));
-   FILE* fh = popen(config->mta.c_str(), "w");
-   if (fh == NULL)
--    throw system_error(string("Can't start MTA '") + config->mta + "'");
-+    throw mapson_system_error(string("Can't start MTA '") + config->mta + "'");
-   if (fwrite(mail_template.data(), mail_template.size(), 1, fh) != 1)
-   {
-     pclose(fh);
--    throw system_error(string("Failed to pipe to MTA process '") + config->mta + "'");
-+    throw mapson_system_error(string("Failed to pipe to MTA process '") + config->mta + "'");
-   }
-   pclose(fh);
- }
---- a/spool.cpp
-+++ b/spool.cpp
-@@ -44,13 +44,13 @@
-   info("Spooling e-mail '%s' as '%s'.", config->message_id.c_str(), filename.c_str());
-   int fd = open(filename.c_str(), O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
-   if (fd < 0)
--    throw system_error(string("Can't open spool file '") + filename + "' for writing");
-+    throw mapson_system_error(string("Can't open spool file '") + filename + "' for writing");
-   fd_sentry sentry(fd);
-   for (size_t len = 0; len < mail.size(); )
-   {
-     ssize_t rc = write(fd, mail.data()+len, mail.size()-len);
-     if (rc < 0)
--      throw system_error(string("Failed writing to the spool file '") + filename + "'");
-+      throw mapson_system_error(string("Failed writing to the spool file '") + filename + "'");
-     else
-       len += rc;
-   }
---- a/system-error.hpp
-+++ b/system-error.hpp
-@@ -23,14 +23,14 @@
- #include <string>
- #include <cstring>
- 
--class system_error : public std::runtime_error
-+class mapson_system_error : public std::runtime_error
- {
- public:
--  system_error() : runtime_error(str())
-+  mapson_system_error() : runtime_error(str())
-   {
-   }
- 
--  explicit system_error(std::string const & msg)
-+  explicit mapson_system_error(std::string const & msg)
-     : runtime_error(msg + ": " + str())
-   {
-   }
diff --git a/mail-filter/mapson/mapson-3.3-r1.ebuild b/mail-filter/mapson/mapson-3.3-r1.ebuild
deleted file mode 100644
index 9903dbb7f789..000000000000
--- a/mail-filter/mapson/mapson-3.3-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A challenge/response-based white-list spam filter"
-HOMEPAGE="http://mapson.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mapson/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug"
-
-RDEPEND="
-	acct-user/mail
-	virtual/mta
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3-gcc6.patch
-	"${FILESDIR}"/${PN}-3.3-respect-AR.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with debug)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	dodoc AUTHORS INSTALL NEWS README
-	doman doc/mapson.1
-
-	docinto html
-	dodoc doc/mapson.html
-
-	insinto /etc/mapson
-	newins sample-config mapson.config
-
-	insinto /usr/share/mapson
-	newins sample-challenge-template challenge-template
-
-	rm -f "${ED}"/etc/sample-config || die
-	rm -f "${ED}"/usr/share/{mapson.html,sample-challenge-template} || die
-}
diff --git a/mail-filter/mapson/mapson-3.3.1.ebuild b/mail-filter/mapson/mapson-3.3.1.ebuild
index 4735517e167c..33a42b0d4cf3 100644
--- a/mail-filter/mapson/mapson-3.3.1.ebuild
+++ b/mail-filter/mapson/mapson-3.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mapson/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug"
 
 RDEPEND="