From: Fabrice Fontaine Date: Fri, 22 May 2020 13:58:07 +0000 (+0200) Subject: package/dovecot: drop first patch X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6d7df70016d51c4813c77095705cf8a0e3e1c09e;p=buildroot.git package/dovecot: drop first patch First patch is not needed since version 2.3.0 and https://github.com/dovecot/core/commit/08259c1f206026ca9b9f4b4e97603943c6093def Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- diff --git a/package/dovecot/0001-byteorder.h-fix-uclibc-build.patch b/package/dovecot/0001-byteorder.h-fix-uclibc-build.patch deleted file mode 100644 index b6d3ed3ec0..0000000000 --- a/package/dovecot/0001-byteorder.h-fix-uclibc-build.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 902917880ca29f1007750a70cf46e7246b2d0a2a Mon Sep 17 00:00:00 2001 -From: Josef 'Jeff' Sipek -Date: Tue, 14 Nov 2017 06:01:21 +0100 -Subject: [PATCH] byteorder.h: fix uclibc build - -Patch suggested on upstream mailinglist: -https://www.dovecot.org/pipermail/dovecot/2017-November/110019.html - -Signed-off-by: Bernd Kuhls ---- - src/lib/byteorder.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/lib/byteorder.h b/src/lib/byteorder.h -index 2f5dc7c17..4ffe8da21 100644 ---- a/src/lib/byteorder.h -+++ b/src/lib/byteorder.h -@@ -23,6 +23,11 @@ - #ifndef BYTEORDER_H - #define BYTEORDER_H - -+#undef bswap_8 -+#undef bswap_16 -+#undef bswap_32 -+#undef bswap_64 -+ - /* - * These prototypes exist to catch bugs in the code generating macros below. - */ --- -2.11.0 - diff --git a/package/dovecot/0001-lib-ssl-iostream-Do-not-build-static-test-iostream-s.patch b/package/dovecot/0001-lib-ssl-iostream-Do-not-build-static-test-iostream-s.patch new file mode 100644 index 0000000000..686ed7383b --- /dev/null +++ b/package/dovecot/0001-lib-ssl-iostream-Do-not-build-static-test-iostream-s.patch @@ -0,0 +1,30 @@ +From 40851dc3471809cabe8cc3f9b71980f8d82344ae Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 4 Jan 2020 14:39:39 +0100 +Subject: [PATCH] lib-ssl-iostream: Do not build static test-iostream-ssl + +Fixes broken static build: +https://dovecot.org/pipermail/dovecot/2019-October/117326.html + +Patch sent upstream: https://github.com/dovecot/core/pull/111 + +Signed-off-by: Bernd Kuhls +--- + src/lib-ssl-iostream/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/lib-ssl-iostream/Makefile.am b/src/lib-ssl-iostream/Makefile.am +index 94ead5cec..5aaea5d51 100644 +--- a/src/lib-ssl-iostream/Makefile.am ++++ b/src/lib-ssl-iostream/Makefile.am +@@ -46,7 +46,6 @@ test_libs = \ + ../lib/liblib.la + + test_iostream_ssl_SOURCES = test-iostream-ssl.c +-test_iostream_ssl_LDFLAGS = -static + test_iostream_ssl_LDADD = $(test_libs) $(SSL_LIBS) $(DLLIB) + test_iostream_ssl_DEPENDENCIES = $(test_libs) + +-- +2.20.1 + diff --git a/package/dovecot/0002-lib-ssl-iostream-Do-not-build-static-test-iostream-s.patch b/package/dovecot/0002-lib-ssl-iostream-Do-not-build-static-test-iostream-s.patch deleted file mode 100644 index 686ed7383b..0000000000 --- a/package/dovecot/0002-lib-ssl-iostream-Do-not-build-static-test-iostream-s.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 40851dc3471809cabe8cc3f9b71980f8d82344ae Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 4 Jan 2020 14:39:39 +0100 -Subject: [PATCH] lib-ssl-iostream: Do not build static test-iostream-ssl - -Fixes broken static build: -https://dovecot.org/pipermail/dovecot/2019-October/117326.html - -Patch sent upstream: https://github.com/dovecot/core/pull/111 - -Signed-off-by: Bernd Kuhls ---- - src/lib-ssl-iostream/Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/lib-ssl-iostream/Makefile.am b/src/lib-ssl-iostream/Makefile.am -index 94ead5cec..5aaea5d51 100644 ---- a/src/lib-ssl-iostream/Makefile.am -+++ b/src/lib-ssl-iostream/Makefile.am -@@ -46,7 +46,6 @@ test_libs = \ - ../lib/liblib.la - - test_iostream_ssl_SOURCES = test-iostream-ssl.c --test_iostream_ssl_LDFLAGS = -static - test_iostream_ssl_LDADD = $(test_libs) $(SSL_LIBS) $(DLLIB) - test_iostream_ssl_DEPENDENCIES = $(test_libs) - --- -2.20.1 - diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index 9f89ce6354..86e101d80a 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -14,7 +14,7 @@ DOVECOT_DEPENDENCIES = \ host-pkgconf \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ openssl -# 0002-lib-ssl-iostream-Do-not-build-static-test-iostream-s.patch +# 0001-lib-ssl-iostream-Do-not-build-static-test-iostream-s.patch DOVECOT_AUTORECONF = YES # add host-gettext for AM_ICONV macro DOVECOT_DEPENDENCIES += host-gettext