summaryrefslogtreecommitdiff
path: root/mail-mta/nullmailer
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 22:19:36 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-14 23:22:23 +0100
commit4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree76e74807bc479502e13866b581b6bf86734ec634 /mail-mta/nullmailer
parent30d6f67c98d149508509d5e86f176d558793acc0 (diff)
gentoo resync : 13.10.2019
Diffstat (limited to 'mail-mta/nullmailer')
-rw-r--r--mail-mta/nullmailer/Manifest5
-rw-r--r--mail-mta/nullmailer/files/nullmailer-2.2-disable-dns-using-test.patch26
-rw-r--r--mail-mta/nullmailer/files/nullmailer-2.2-disable-smtp-auth-tests.patch57
-rw-r--r--mail-mta/nullmailer/files/nullmailer-2.2-fix-test-racecondition.patch29
-rw-r--r--mail-mta/nullmailer/nullmailer-2.2.ebuild6
5 files changed, 122 insertions, 1 deletions
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index bae4fe9fefbf..46dd3526b627 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -2,6 +2,9 @@ AUX init.d-nullmailer-r4 976 BLAKE2B bef0e403a51808dcb1a6d08a5a06746e8f164b8d1e2
AUX init.d-nullmailer-r5 1132 BLAKE2B 2ce6f056f336013fa8786523e3f32359ca5bbdd47343f2ef943b855569a9754d12f65e35ce4d49bf9425cf0d40b628d407b8f2064c0ddc0a742578a852c1c60f SHA512 34a31a53f5f7f1bec4b5cc25bd50e2928cd658360d8430256a5a80a87609a3858a2f2252fce0e5258ac85f1957286c9b449fb1ddb14ace2cfc0dc75cb53aefb9
AUX init.d-nullmailer-r6 1180 BLAKE2B fdfc17abfac24faa184d9cfe8fe3597f09bfe258ca44c41db05d91e0a086c8b52ed12f722f0ce5ecf1b9b5b11fc420cf13cc9127b849150be87fdd7bce94d859 SHA512 951313ba50dacfbfef440ad32bb4196e276bbe9fb636f05d8e311bd7bfea8e89f135a8e48c9df797031517125c848421dddb41215553144e384d98587c74be8d
AUX nullmailer-1.13-unistd.h.patch 867 BLAKE2B 758af8df9518938f930f4095ce71c7c088b2ebcbd6a2814a2eba91521d4507df50f3d92a526cbb8f2a94df4cc080ef115c4d1b81dd0a31fb20c3949961ef91d7 SHA512 0a46f6a10a380a3b5b1527d60eef768f2e1b94b2848c4d866bf3088f9b1592b3fc464c69d2559309adfae6fc8f46f3897585d736b37947239106090c3449aaf3
+AUX nullmailer-2.2-disable-dns-using-test.patch 895 BLAKE2B 5b37129452e13c526a391580fb4816bf81c0db7adbed56d2e51f2948fe43e67bb7e1167ebf1ed1d589194204942efc985f18e14e5d2cd495a20f6df051519fa3 SHA512 d16592477612a716a8883ada1f18c34a4add81cfcfdda252705090e1f0b59f22a9bda9fe26bf950a78e21b9a69d20662825461669db72269280b7f82a1f8f8d9
+AUX nullmailer-2.2-disable-smtp-auth-tests.patch 2383 BLAKE2B 07f2fc7517df280fac5db9dc1db1d8937f6773a26668444df71ffb3593d6da4d0a35f74b51d66c019a84e6ef146da12fe60bc5517f543adcc5984060feebe95b SHA512 fc3bbcd8accd5a37b8292c6fb3e935ab1cd35d4a67bb224eadf48ff54b3b00508d6496e3d40c4546a966ce5dd6c297822a4e76a6b9e69d0ce47dd4e0e3883e47
+AUX nullmailer-2.2-fix-test-racecondition.patch 890 BLAKE2B 7d12af8a9b6071f11e70c6aedbe0471f042c2c2e611eedf768071715b7f42a94b2b41e814a87dd87777810cbb823d20138d40f6aa3aba93ebaec89ebb6d9e2f3 SHA512 10873e538dbc89e8899047e732515d30108b25fd0ff6bb2fc695f5790a94ac32629f41c470a2fec951357169fead36ee4512f543ad0e02c52f09799334b815c7
AUX nullmailer.service 401 BLAKE2B cca2fbdad581638f52a59caea902ca5701ca69e8b0e4a7c8fd87b8bfe3b9c233422ed0d93c0c583778e25998758c70cdf1602e35316739fa27018a590e28c8a5 SHA512 5aebb237972a7ff20a34d40d53d8d3146966c8f12b20695aa718831a6b32ecf4a0cc9d5af41067952c454166d02d52226fcb397b48310907b81deaa2d874adb7
AUX remotes.sample-1.13 969 BLAKE2B f973a3866a31b5d6bf1ac227340df4484b570039c7237a7c4e44516b2ca796c627cd00473f42e1c017865915cf8933f4d3df856ead3439d9e1e97bdded8bf81e SHA512 379d307dc28b60e759ebe701d43508b45bc66560879ba2baa30c11c0a57ff67e55151624b5dd67962cb72b22702d14c309f6b6be59a5dd2d030576cb691bcbc6
AUX remotes.sample-2.0 920 BLAKE2B 26e777624086267e543354f130d3abc9591d832afbd80b8efd1fd2ce2391ed16641877077d90cef7d491a844e94fec3cba0a45dd452aa7f29151dd5873871200 SHA512 21694c7cceb3bdd743e30e2241b5e3293a3ad0fcdc4345d200f2e81c26b72b8a53c6cc3912a4e5f1de6411658a2144803746b44b59d48024cb3de33d72238354
@@ -13,5 +16,5 @@ EBUILD nullmailer-1.13-r5.ebuild 4737 BLAKE2B 38fc205db2a05cabd46966d5ce3068e300
EBUILD nullmailer-2.0-r1.ebuild 3641 BLAKE2B 0f856d777485527c4b04ad21077c3646bb2106b69050100e20c663bf895ba1846759a423f23928fec9711ccd7595b8c74183e1d0e6eb51f1f82abc192b5f956d SHA512 bd858bf7830066e10c2ef859d8489a0ab124cb7873e327b14d011d286ab5cae94f4e80d86e64dfd13f1204580e6a57bf0495387f6dd361082a874db655bb69f6
EBUILD nullmailer-2.0-r2.ebuild 3709 BLAKE2B 41275b774fa0bc2ee9ff1445eda2837b5f4c40cec834d96fc1f26b97d107cde93bef981d5214af5f0f7d3ce58c51c28ca69c2a86b0b4c195f736d7d16c5c842f SHA512 49a5f12cb2810f1d21dbd0cad4d92995a06a32b9e15ab1a341cad12f3afa924a2a47416d8bcf65df3f535b93343c35841386652b315a3ac4d73ab2d427c2ce16
EBUILD nullmailer-2.0.ebuild 3644 BLAKE2B 0f498b234679f0690a9644d755a9c1cbcbb2cc2c0288b361bea7977644a993ecf61337ca4c1997c9d221f823fd9ddbc70ffaf5b315c99e8aa99041d7c1b845d2 SHA512 5ac17ea2d17a2967399bdfc87b749d1b152741191b801f6e4fec4a1f6ad1977a2cea9dbabf19a8f62e17a7a32c9d90271fbaa93cd68532a8e6ae41ba126af903
-EBUILD nullmailer-2.2.ebuild 4091 BLAKE2B 58882188fdcb537b8c3937798cb2db5c6629d0a13681f2f99402481a7af1f2a5097f6877f590a4a637c3e22cab32229f78f882be565f8d59f06cdeadc589c999 SHA512 01e9258a7ad63a0abab3bbe342f8282a05da8486826520462efc6f7e48c1a1ae75f33b798572d555d6b1e4efd2e8c600e42009ecee0f498c0a56bc49024779f8
+EBUILD nullmailer-2.2.ebuild 4252 BLAKE2B a81f022f87622ad7e140b85f9b73cc74b78431675f9d288ac0b1fb6e2111417aeae36cbb3b325cb1d02c30bae1d434fdce3838f641d20d76d87b8a380c321667 SHA512 4487c594e807fee494215350801d87aa4c8341b67028e5396c44212ea5f9245ac751dc057425fd35408b5ecdf453a9c3428e541f363564c8c8b3379f809fb90f
MISC metadata.xml 462 BLAKE2B 6bb4c3b64b2a26224d66df58a133e26bec2c8db7069f5f94b131c4b09387d707a8d5170f0581c9c5136e79af4b97b5f5c3ca4a649171497957ef4aef4312a2cd SHA512 d1370220b0d410947a347c71c9dca8070b3c4a28a82742f618f605be86099ffd37dce1a7d6ab706248eae290aaaf8de2df57c5b3c8f8e818464b9eb5d26d7719
diff --git a/mail-mta/nullmailer/files/nullmailer-2.2-disable-dns-using-test.patch b/mail-mta/nullmailer/files/nullmailer-2.2-disable-dns-using-test.patch
new file mode 100644
index 000000000000..0c5939ab004f
--- /dev/null
+++ b/mail-mta/nullmailer/files/nullmailer-2.2-disable-dns-using-test.patch
@@ -0,0 +1,26 @@
+https://sources.debian.org/data/main/n/nullmailer/1:2.2-3/debian/patches/0006-Disable-DNS-using-test.patch
+
+From: David Bremner <david@tethera.net>
+Date: Wed, 31 Oct 2018 09:18:53 -0300
+Subject: Disable DNS using test.
+
+This is probably against policy, and causes build failures in pbuilder
+---
+ test/tests/protocols | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/tests/protocols b/test/tests/protocols
+index 52209d7..8f67b0a 100644
+--- a/test/tests/protocols
++++ b/test/tests/protocols
+@@ -28,8 +28,8 @@ do
+
+ stop server
+
+- echo "Testing host not found error with $p."
+- error 2 protocol $p --host=this.host.can.not.exist 3<$testmail
++# echo "Testing host not found error with $p."
++# error 2 protocol $p --host=this.host.can.not.exist 3<$testmail
+
+ echo "Testing connection refused error with $p."
+ error 7 protocol $p -p $port --host=localhost 3<$testmail
diff --git a/mail-mta/nullmailer/files/nullmailer-2.2-disable-smtp-auth-tests.patch b/mail-mta/nullmailer/files/nullmailer-2.2-disable-smtp-auth-tests.patch
new file mode 100644
index 000000000000..f66a4841f4fb
--- /dev/null
+++ b/mail-mta/nullmailer/files/nullmailer-2.2-disable-smtp-auth-tests.patch
@@ -0,0 +1,57 @@
+https://sources.debian.org/data/main/n/nullmailer/1:2.2-3/debian/patches/0007-disable-all-smtp-auth-tests.patch
+
+From: David Bremner <david@tethera.net>
+Date: Tue, 25 Dec 2018 08:18:35 +0900
+Subject: disable all smtp-auth tests
+
+These seem racy in ways that I haven't been able to completely nail down
+---
+ test/tests/smtp-auth | 32 ++++++++++++++++----------------
+ 1 file changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/test/tests/smtp-auth b/test/tests/smtp-auth
+index 52e12d0..2dc736f 100644
+--- a/test/tests/smtp-auth
++++ b/test/tests/smtp-auth
+@@ -1,25 +1,25 @@
+ . functions
+ export HELOHOST=f.q.d.n
+
+-make-testmail
++# make-testmail
+
+-start server "tcpserver -1 ::0 0 sh $srcdir/test/authtest-smtp.sh $tmpdir/smtp-result"
+-catch-port server
++# start server "tcpserver -1 ::0 0 sh $srcdir/test/authtest-smtp.sh $tmpdir/smtp-result"
++# catch-port server
+
+-echo 'Testing auth success with smtp'
+-echo '250 OK' > $tmpdir/smtp-result
+-protocol smtp --host=localhost --port=$port --user=example --pass=example 3<$testmail
++# echo 'Testing auth success with smtp'
++# echo '250 OK' > $tmpdir/smtp-result
++# protocol smtp --host=localhost --port=$port --user=example --pass=example 3<$testmail
+
+-echo 'Testing auth login success with smtp'
+-echo $'350 Go ahead\n250 AUTH' > $tmpdir/smtp-result
+-protocol smtp --host=localhost --port=$port --user=example --pass=example --auth-login 3<$testmail
++# echo 'Testing auth login success with smtp'
++# echo $'350 Go ahead\n250 AUTH' > $tmpdir/smtp-result
++# protocol smtp --host=localhost --port=$port --user=example --pass=example --auth-login 3<$testmail
+
+-echo 'Testing auth temporary failure with smtp'
+-echo '450 No' > $tmpdir/smtp-result
+-error 16 protocol smtp --host=localhost --port $port --user=example --pass=example 3<$testmail
++# echo 'Testing auth temporary failure with smtp'
++# echo '450 No' > $tmpdir/smtp-result
++# error 16 protocol smtp --host=localhost --port $port --user=example --pass=example 3<$testmail
+
+-echo 'Testing auth permanent failure with smtp'
+-echo '550 No' > $tmpdir/smtp-result
+-error 20 protocol smtp --host=localhost --port $port --user=example --pass=example 3<$testmail
++# echo 'Testing auth permanent failure with smtp'
++# echo '550 No' > $tmpdir/smtp-result
++# error 20 protocol smtp --host=localhost --port $port --user=example --pass=example 3<$testmail
+
+-stop server
++# stop server
diff --git a/mail-mta/nullmailer/files/nullmailer-2.2-fix-test-racecondition.patch b/mail-mta/nullmailer/files/nullmailer-2.2-fix-test-racecondition.patch
new file mode 100644
index 000000000000..8f721d8d8ccf
--- /dev/null
+++ b/mail-mta/nullmailer/files/nullmailer-2.2-fix-test-racecondition.patch
@@ -0,0 +1,29 @@
+https://sources.debian.org/data/main/n/nullmailer/1:2.2-3/debian/patches/0001-Remove-race-conditions-from-tests.patch
+
+From: Felix Lechner <felix.lechner@lease-up.com>
+Date: Sat, 2 Sep 2017 09:57:43 -0300
+Subject: Remove race conditions from tests
+
+Testing the qmqp protocol fails because the testing server cannot
+acquire the lock. This is solved by waiting for the previous
+server to exit gracefully and clear the lock. Similarly, wait
+before removing temporary directories.
+
+Forwarded: no
+Last-Update: 2017-10-07
+---
+ test/tests/protocols | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/tests/protocols b/test/tests/protocols
+index 0309d12..52209d7 100644
+--- a/test/tests/protocols
++++ b/test/tests/protocols
+@@ -54,6 +54,7 @@ do
+ echo "Testing protocol failure with $p."
+ error 11 protocol $p -p $port --host=localhost 3<$testmail
+ stop server
++ wait
+ done
+
+ stop server
diff --git a/mail-mta/nullmailer/nullmailer-2.2.ebuild b/mail-mta/nullmailer/nullmailer-2.2.ebuild
index 178c1507ac2b..59e8c37fad7d 100644
--- a/mail-mta/nullmailer/nullmailer-2.2.ebuild
+++ b/mail-mta/nullmailer/nullmailer-2.2.ebuild
@@ -35,6 +35,12 @@ RDEPEND="
!mail-mta/ssmtp[mta(+)]
"
+PATCHES=(
+ "${FILESDIR}/${P}-fix-test-racecondition.patch"
+ "${FILESDIR}/${P}-disable-dns-using-test.patch"
+ "${FILESDIR}/${P}-disable-smtp-auth-tests.patch"
+)
+
pkg_setup() {
enewgroup nullmail 88
enewuser nullmail 88 -1 /var/spool/nullmailer nullmail