mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-04 16:10:10 +00:00
dovecot: refresh patches
Signed-off-by: Armin kuster <akuster808@gamil.com>
This commit is contained in:
parent
197453e127
commit
95969f0f5f
|
|
@ -13,11 +13,11 @@ Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
|
||||||
configure.ac | 15 +++++----------
|
configure.ac | 15 +++++----------
|
||||||
1 file changed, 5 insertions(+), 10 deletions(-)
|
1 file changed, 5 insertions(+), 10 deletions(-)
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
Index: dovecot-2.2.36.4/configure.ac
|
||||||
index 3b32614..94ec002 100644
|
===================================================================
|
||||||
--- a/configure.ac
|
--- dovecot-2.2.36.4.orig/configure.ac
|
||||||
+++ b/configure.ac
|
+++ dovecot-2.2.36.4/configure.ac
|
||||||
@@ -519,13 +519,10 @@ have_ioloop=no
|
@@ -490,13 +490,10 @@ have_ioloop=no
|
||||||
|
|
||||||
if test "$ioloop" = "best" || test "$ioloop" = "epoll"; then
|
if test "$ioloop" = "best" || test "$ioloop" = "epoll"; then
|
||||||
AC_CACHE_CHECK([whether we can use epoll],i_cv_epoll_works,[
|
AC_CACHE_CHECK([whether we can use epoll],i_cv_epoll_works,[
|
||||||
|
|
@ -34,7 +34,7 @@ index 3b32614..94ec002 100644
|
||||||
], [
|
], [
|
||||||
i_cv_epoll_works=yes
|
i_cv_epoll_works=yes
|
||||||
], [
|
], [
|
||||||
@@ -653,7 +650,7 @@ fi
|
@@ -596,7 +593,7 @@ fi
|
||||||
dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it.
|
dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it.
|
||||||
dnl * It may also be broken in AIX.
|
dnl * It may also be broken in AIX.
|
||||||
AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[
|
AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[
|
||||||
|
|
@ -43,7 +43,7 @@ index 3b32614..94ec002 100644
|
||||||
#define _XOPEN_SOURCE 600
|
#define _XOPEN_SOURCE 600
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
@@ -662,7 +659,7 @@ AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[
|
@@ -605,7 +602,7 @@ AC_CACHE_CHECK([whether posix_fallocate(
|
||||||
#if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 7)
|
#if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 7)
|
||||||
possibly broken posix_fallocate
|
possibly broken posix_fallocate
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -52,7 +52,7 @@ index 3b32614..94ec002 100644
|
||||||
int fd = creat("conftest.temp", 0600);
|
int fd = creat("conftest.temp", 0600);
|
||||||
int ret;
|
int ret;
|
||||||
if (fd == -1) {
|
if (fd == -1) {
|
||||||
@@ -671,8 +668,6 @@ AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[
|
@@ -614,8 +611,6 @@ AC_CACHE_CHECK([whether posix_fallocate(
|
||||||
}
|
}
|
||||||
ret = posix_fallocate(fd, 1024, 1024) < 0 ? 1 : 0;
|
ret = posix_fallocate(fd, 1024, 1024) < 0 ? 1 : 0;
|
||||||
unlink("conftest.temp");
|
unlink("conftest.temp");
|
||||||
|
|
@ -61,6 +61,3 @@ index 3b32614..94ec002 100644
|
||||||
], [
|
], [
|
||||||
i_cv_posix_fallocate_works=yes
|
i_cv_posix_fallocate_works=yes
|
||||||
], [
|
], [
|
||||||
--
|
|
||||||
1.8.4.2
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,11 +18,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
src/doveadm/Makefile.am | 4 ++--
|
src/doveadm/Makefile.am | 4 ++--
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/doveadm/Makefile.am b/src/doveadm/Makefile.am
|
Index: dovecot-2.2.36.4/src/doveadm/Makefile.am
|
||||||
index c644646..6ae9144 100644
|
===================================================================
|
||||||
--- a/src/doveadm/Makefile.am
|
--- dovecot-2.2.36.4.orig/src/doveadm/Makefile.am
|
||||||
+++ b/src/doveadm/Makefile.am
|
+++ dovecot-2.2.36.4/src/doveadm/Makefile.am
|
||||||
@@ -180,8 +180,8 @@ test_libs = \
|
@@ -182,8 +182,8 @@ test_libs = \
|
||||||
../lib/liblib.la
|
../lib/liblib.la
|
||||||
test_deps = $(noinst_LTLIBRARIES) $(test_libs)
|
test_deps = $(noinst_LTLIBRARIES) $(test_libs)
|
||||||
|
|
||||||
|
|
@ -33,6 +33,3 @@ index c644646..6ae9144 100644
|
||||||
test_doveadm_util_DEPENDENCIES = $(test_deps)
|
test_doveadm_util_DEPENDENCIES = $(test_deps)
|
||||||
|
|
||||||
check: check-am check-test
|
check: check-am check-test
|
||||||
--
|
|
||||||
2.14.2
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,10 +14,12 @@ CVE: CVE-2020-12100
|
||||||
Upstream-Status: Backport [http://archive.ubuntu.com/ubuntu/pool/main/d/dovecot/dovecot_2.2.33.2-1ubuntu4.7.debian.tar.xz]
|
Upstream-Status: Backport [http://archive.ubuntu.com/ubuntu/pool/main/d/dovecot/dovecot_2.2.33.2-1ubuntu4.7.debian.tar.xz]
|
||||||
Comment: No change in any hunk
|
Comment: No change in any hunk
|
||||||
|
|
||||||
--- a/src/lib-mail/message-parser.c
|
Index: dovecot-2.2.36.4/src/lib-mail/message-parser.c
|
||||||
+++ b/src/lib-mail/message-parser.c
|
===================================================================
|
||||||
|
--- dovecot-2.2.36.4.orig/src/lib-mail/message-parser.c
|
||||||
|
+++ dovecot-2.2.36.4/src/lib-mail/message-parser.c
|
||||||
@@ -1,7 +1,7 @@
|
@@ -1,7 +1,7 @@
|
||||||
/* Copyright (c) 2002-2017 Dovecot authors, see the included COPYING file */
|
/* Copyright (c) 2002-2018 Dovecot authors, see the included COPYING file */
|
||||||
|
|
||||||
#include "lib.h"
|
#include "lib.h"
|
||||||
-#include "buffer.h"
|
-#include "buffer.h"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user