summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Siebeck <gentoo.2019@r123.de>2020-05-11 19:09:43 +0200
committerAaron Bauman <bman@gentoo.org>2020-05-14 18:19:21 -0400
commit99d8545796e75d781dfedbae9d4f26b1cb5a52b4 (patch)
treeb4140686fa161716ba35e18983ebcb16ddf0c1dc
parentnet-misc/freerdp: security cleanup (diff)
downloadgentoo-99d8545796e75d781dfedbae9d4f26b1cb5a52b4.tar.gz
gentoo-99d8545796e75d781dfedbae9d4f26b1cb5a52b4.tar.bz2
gentoo-99d8545796e75d781dfedbae9d4f26b1cb5a52b4.zip
mail-client/alpine: fix compilation with gcc-10
Closes: https://bugs.gentoo.org/721618 Signed-off-by: Robert Siebeck <gentoo.2019@r123.de> Closes: https://github.com/gentoo/gentoo/pull/15753 Signed-off-by: Aaron Bauman <bman@gentoo.org>
-rw-r--r--mail-client/alpine/alpine-2.22-r1.ebuild1
-rw-r--r--mail-client/alpine/files/alpine-2.22-fno-common.patch19
2 files changed, 20 insertions, 0 deletions
diff --git a/mail-client/alpine/alpine-2.22-r1.ebuild b/mail-client/alpine/alpine-2.22-r1.ebuild
index 2d77170f985..95787b03996 100644
--- a/mail-client/alpine/alpine-2.22-r1.ebuild
+++ b/mail-client/alpine/alpine-2.22-r1.ebuild
@@ -31,6 +31,7 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}/${P}-cc.patch"
+ "${FILESDIR}/${P}-fno-common.patch"
)
src_prepare() {
diff --git a/mail-client/alpine/files/alpine-2.22-fno-common.patch b/mail-client/alpine/files/alpine-2.22-fno-common.patch
new file mode 100644
index 00000000000..0ef289eb8cd
--- /dev/null
+++ b/mail-client/alpine/files/alpine-2.22-fno-common.patch
@@ -0,0 +1,19 @@
+--- a/pith/smkeys.c
++++ b/pith/smkeys.c
+@@ -34,6 +34,7 @@ static char rcsid[] = "$Id: smkeys.c 1266 2009-07-14 18:39:12Z hubert@u.washingt
+ #include "../pith/util.h"
+ #include "../pith/mailindx.h"
+ #include "../pith/readfile.h"
++#include "../pith/options.h"
+ #include "smkeys.h"
+
+ #ifdef APPLEKEYCHAIN
+@@ -50,8 +51,6 @@ static int mem_add_extra_cacerts(char *contents, X509_LOOKUP *lookup);
+ int compare_certs_by_name(const void *data1, const void *data2);
+ int password_policy_check(char *);
+
+-int (*pith_smime_enter_password)(char *, char *, size_t);
+-
+ /* test if password passes a predetermined policy.
+ * return value: 0 - does not pass; 1 - it passes
+ */