commit: a9fee5c109c671e034d31127ea59d988ab15f5fb Author: Theo Anderson <telans <AT> posteo <DOT> de> AuthorDate: Sun Jan 17 10:25:02 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Tue Jun 15 06:02:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9fee5c1
mail-mta/nullmailer: fix build with clang (c++11) Closes: https://bugs.gentoo.org/669746 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Theo Anderson <telans <AT> posteo.de> Closes: https://github.com/gentoo/gentoo/pull/19088 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../nullmailer/files/nullmailer-2.2-c++11.patch | 36 ++++++++++++++++++++++ mail-mta/nullmailer/nullmailer-2.2-r1.ebuild | 1 + 2 files changed, 37 insertions(+) diff --git a/mail-mta/nullmailer/files/nullmailer-2.2-c++11.patch b/mail-mta/nullmailer/files/nullmailer-2.2-c++11.patch new file mode 100644 index 00000000000..ac2eb23a338 --- /dev/null +++ b/mail-mta/nullmailer/files/nullmailer-2.2-c++11.patch @@ -0,0 +1,36 @@ +From f63dcd3d7ec69a7150f305ba81380988e0a1e38d Mon Sep 17 00:00:00 2001 +From: Denis Pronin <[email protected]> +Date: Tue, 25 Feb 2020 10:06:41 +0300 +Subject: [PATCH] fixed compilation with c++11 standard + +Signed-off-by: Denis Pronin <[email protected]> +--- + src/inject.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/inject.cc b/src/inject.cc +index 0a555b2..189a70a 100644 +--- a/src/inject.cc ++++ b/src/inject.cc +@@ -148,9 +148,10 @@ static bool header_add_to = false; + + struct header_field + { ++ typedef unsigned length_t; + // member information + const char* name; +- unsigned length; ++ length_t length; + bool is_address; + bool is_recipient; + bool is_sender; +@@ -204,7 +205,8 @@ struct header_field + + #define F false + #define T true +-#define X(N,IA,IR,IS,IRS,R) { #N ":",strlen(#N ":"),\ ++#define X(N,IA,IR,IS,IRS,R) { #N ":", \ ++ static_cast<header_field::length_t>(strlen(#N ":")),\ + IA,IR,IS,IRS,R,false, false } + static header_field header_fields[] = { + // Sender address fields, in order of priority diff --git a/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild b/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild index 1835317ed6c..53c1cabc06f 100644 --- a/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild +++ b/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild @@ -40,6 +40,7 @@ PATCHES=( "${FILESDIR}/${P}-fix-test-racecondition.patch" "${FILESDIR}/${P}-disable-dns-using-test.patch" "${FILESDIR}/${P}-disable-smtp-auth-tests.patch" + "${FILESDIR}/${P}-c++11.patch" ) pkg_setup() {
