summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2021-07-17 16:00:54 +0300
committerEray Aslan <eras@gentoo.org>2021-07-17 16:00:54 +0300
commitc7831824c64115adf396d7383272a078d7273633 (patch)
tree222d747618f5b9e9a0b037435a2fbb9e3da1d5e3 /net-mail/dovecot/files
parentdev-java/dom4j: bump to 2.1.3 (CVE-2020-10683) (diff)
downloadgentoo-c7831824c64115adf396d7383272a078d7273633.tar.gz
gentoo-c7831824c64115adf396d7383272a078d7273633.tar.bz2
gentoo-c7831824c64115adf396d7383272a078d7273633.zip
net-mail/dovecot: cleanup
Bug: https://bugs.gentoo.org/797349 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Eray Aslan <eras@gentoo.org>
Diffstat (limited to 'net-mail/dovecot/files')
-rw-r--r--net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-1.patch52
-rw-r--r--net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-2.patch27
-rw-r--r--net-mail/dovecot/files/dovecot-unwind-generic.patch15
3 files changed, 0 insertions, 94 deletions
diff --git a/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-1.patch b/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-1.patch
deleted file mode 100644
index 204424c5ebb0..000000000000
--- a/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-1.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://bugs.gentoo.org/764713
-https://github.com/dovecot/core/commit/2cc1feca9087651902a5ea3cda021c8a0b3217ce.patch
-
-From 2cc1feca9087651902a5ea3cda021c8a0b3217ce Mon Sep 17 00:00:00 2001
-From: Paul Howarth <paul@city-fan.org>
-Date: Mon, 4 Jan 2021 16:31:03 +0000
-Subject: [PATCH] lib: Fix timeval_cmp_margin for 32-bit systems
-
-The test suite compares times with seconds values of -INT_MAX and
-INT_MAX. The result of this comparison does not fit in a value of
-type int and so the test suite fails on 32-bit systems where time_t
-is an int. To fix this, calculations on seconds values are done
-using long long integers.
-
-Broken by 16ab5542
----
- src/lib/time-util.c | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/lib/time-util.c b/src/lib/time-util.c
-index 294bb02310..3f4cd01c9e 100644
---- a/src/lib/time-util.c
-+++ b/src/lib/time-util.c
-@@ -38,21 +38,23 @@ int timeval_cmp(const struct timeval *tv1, const struct timeval *tv2)
- int timeval_cmp_margin(const struct timeval *tv1, const struct timeval *tv2,
- unsigned int usec_margin)
- {
-- long long usecs_diff;
-+ long long secs_diff, usecs_diff;
- int sec_margin, ret;
-
- if (tv1->tv_sec < tv2->tv_sec) {
- sec_margin = ((int)usec_margin / 1000000) + 1;
-- if ((tv2->tv_sec - tv1->tv_sec) > sec_margin)
-+ secs_diff = (long long)tv2->tv_sec - (long long)tv1->tv_sec;
-+ if (secs_diff > sec_margin)
- return -1;
-- usecs_diff = (tv2->tv_sec - tv1->tv_sec) * 1000000LL +
-+ usecs_diff = secs_diff * 1000000LL +
- (tv2->tv_usec - tv1->tv_usec);
- ret = -1;
- } else if (tv1->tv_sec > tv2->tv_sec) {
- sec_margin = ((int)usec_margin / 1000000) + 1;
-- if ((tv1->tv_sec - tv2->tv_sec) > sec_margin)
-+ secs_diff = (long long)tv1->tv_sec - (long long)tv2->tv_sec;
-+ if (secs_diff > sec_margin)
- return 1;
-- usecs_diff = (tv1->tv_sec - tv2->tv_sec) * 1000000LL +
-+ usecs_diff = secs_diff * 1000000LL +
- (tv1->tv_usec - tv2->tv_usec);
- ret = 1;
- } else if (tv1->tv_usec < tv2->tv_usec) {
diff --git a/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-2.patch b/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-2.patch
deleted file mode 100644
index 8956773b43ef..000000000000
--- a/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/764713
-https://github.com/dovecot/core/commit/01366bd18ea98bf6979328ff8580488920a33f0c
-
-From 01366bd18ea98bf6979328ff8580488920a33f0c Mon Sep 17 00:00:00 2001
-From: Aki Tuomi <aki.tuomi@open-xchange.com>
-Date: Thu, 4 Feb 2021 08:44:46 +0200
-Subject: [PATCH] lib: test-time-util - Use correct types for test case
-
-Fixes type mismatch on 32-bit systems.
----
- src/lib/test-time-util.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/test-time-util.c b/src/lib/test-time-util.c
-index cfa322048e..139db0ec5d 100644
---- a/src/lib/test-time-util.c
-+++ b/src/lib/test-time-util.c
-@@ -358,7 +358,8 @@ static void test_str_to_timeval(void)
- {
- struct {
- const char *str;
-- unsigned int tv_sec, tv_usec;
-+ time_t tv_sec;
-+ suseconds_t tv_usec;
- } tests[] = {
- { "0", 0, 0 },
- { "0.0", 0, 0 },
diff --git a/net-mail/dovecot/files/dovecot-unwind-generic.patch b/net-mail/dovecot/files/dovecot-unwind-generic.patch
deleted file mode 100644
index f7bc8d94ff23..000000000000
--- a/net-mail/dovecot/files/dovecot-unwind-generic.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Bug 728336
---- a/m4/want_unwind.m4
-+++ b/m4/want_unwind.m4
-@@ -4,9 +4,9 @@
- PKG_CHECK_EXISTS([libunwind], [
- PKG_CHECK_MODULES([LIBUNWIND], [libunwind],[
- dnl see if there is target-specific library
-- AC_CHECK_LIB([unwind-${build_cpu}], [_U${build_cpu}_init_local],[
-+ PKG_CHECK_MODULES([LIBUNWIND_GENERIC], [libunwind-generic],[
- have_libunwind=yes
-- LIBUNWIND_LIBS="$LIBUNWIND_LIBS -lunwind-${build_cpu}"
-+ LIBUNWIND_LIBS="$LIBUNWIND_LIBS $LIBUNWIND_GENERIC_LIBS"
- AC_DEFINE([HAVE_LIBUNWIND],,[Define this if you have libunwind])
- ],[
- have_libunwind=no