Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-mta/exim/files/, mail-mta/exim/
Date: Sun, 24 May 2020 11:27:05
Message-Id: 1590319614.08aa447245b739b69a7e36cd324967b3160f2865.grobian@gentoo
1 commit: 08aa447245b739b69a7e36cd324967b3160f2865
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 24 11:26:24 2020 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Sun May 24 11:26:54 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08aa4472
7
8 mail-mta/exim-4.93.0.4-r1: add patch to fix compilation using -fno-common
9
10 Closes: https://bugs.gentoo.org/723430
11 Package-Manager: Portage-2.3.89, Repoman-2.3.20
12 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
13
14 mail-mta/exim/exim-4.93.0.4-r1.ebuild | 1 +
15 mail-mta/exim/files/exim-4.93-fno-common.patch | 16 ++++++++++++++++
16 2 files changed, 17 insertions(+)
17
18 diff --git a/mail-mta/exim/exim-4.93.0.4-r1.ebuild b/mail-mta/exim/exim-4.93.0.4-r1.ebuild
19 index cb68569b7c8..19d13cef361 100644
20 --- a/mail-mta/exim/exim-4.93.0.4-r1.ebuild
21 +++ b/mail-mta/exim/exim-4.93.0.4-r1.ebuild
22 @@ -116,6 +116,7 @@ src_prepare() {
23 eapply "${FILESDIR}"/exim-4.93-localscan_dlopen.patch
24 eapply -p2 "${FILESDIR}"/exim-4.93-radius.patch # 720364
25 eapply "${FILESDIR}"/exim-4.93-CVE-2020-12783.patch # 722484
26 + eapply "${FILESDIR}"/exim-4.93-fno-common.patch # 723430
27
28 if use maildir ; then
29 eapply "${FILESDIR}"/exim-4.20-maildir.patch
30
31 diff --git a/mail-mta/exim/files/exim-4.93-fno-common.patch b/mail-mta/exim/files/exim-4.93-fno-common.patch
32 new file mode 100644
33 index 00000000000..c5fff1c6720
34 --- /dev/null
35 +++ b/mail-mta/exim/files/exim-4.93-fno-common.patch
36 @@ -0,0 +1,16 @@
37 +Fix -fno-common linking
38 +
39 +Bug: https://bugs.gentoo.org/723430
40 +Bug: https://bugs.exim.org/show_bug.cgi?id=2577
41 +
42 +--- exim-4.93.0.4/src/globals.h
43 ++++ exim-4.93.0.4/src/globals.h
44 +@@ -342,7 +342,7 @@
45 + extern BOOL allow_domain_literals; /* As it says */
46 + extern BOOL allow_mx_to_ip; /* Allow MX records to -> ip address */
47 + #ifdef EXPERIMENTAL_ARC
48 +-struct arc_set *arc_received; /* highest ARC instance evaluation struct */
49 ++extern struct arc_set *arc_received; /* highest ARC instance evaluation struct */
50 + extern int arc_received_instance; /* highest ARC instance number in headers */
51 + extern int arc_oldest_pass; /* lowest passing instance number in headers */
52 + extern const uschar *arc_state; /* verification state */