Gentoo Archives: gentoo-commits

From: Stefan Strogin <steils@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/imapfilter/, mail-filter/imapfilter/files/
Date: Wed, 30 Dec 2020 03:54:18
Message-Id: 1609300379.eb940ff5f354184c7f53eee7eac50fe372976e71.steils@gentoo
1 commit: eb940ff5f354184c7f53eee7eac50fe372976e71
2 Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 30 03:52:19 2020 +0000
4 Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 30 03:52:59 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb940ff5
7
8 mail-filter/imapfilter: upgrade to 2.7.5
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
11 Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
12
13 mail-filter/imapfilter/Manifest | 1 +
14 .../files/imapfilter-2.7.5-libressl.patch | 26 +++++++++++
15 mail-filter/imapfilter/imapfilter-2.7.5.ebuild | 53 ++++++++++++++++++++++
16 3 files changed, 80 insertions(+)
17
18 diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
19 index f8949b123a0..b6f33917e91 100644
20 --- a/mail-filter/imapfilter/Manifest
21 +++ b/mail-filter/imapfilter/Manifest
22 @@ -1 +1,2 @@
23 DIST imapfilter-2.6.16.tar.gz 59636 BLAKE2B 9de58800ab88aa6e22ead001fd4e635b1991d23a2345d729a59438d3774148b1478b561c36848af155da7d15e84afdf900b73054ef268243f333843b71417d1e SHA512 0500931143e593eb69357ef6a6a40be971abadd22d7e807685b88927da8db9a928470f5cad460252b95ccd42efcfd39b5c4001a8796fa79cbd35018405a7be19
24 +DIST imapfilter-2.7.5.tar.gz 59441 BLAKE2B 0326a698f3be18da47c99cbe20e5e51cde8abcaebf365b3f00e5b1dba6bfaed5139b65766bd447dc596736da504063d5c87c21d1c5c11d6bc7ebd947d9d44835 SHA512 a64747d745ecd5a2f61d486cd8fec1bceeb97ce459ec57454311a960dbfce526c15e8bddeb16860b8efd9710de93845adec61ec892355a0bef7bddc4517e1442
25
26 diff --git a/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch b/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch
27 new file mode 100644
28 index 00000000000..fb665f85271
29 --- /dev/null
30 +++ b/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch
31 @@ -0,0 +1,26 @@
32 +From 9a1132d8c8616b67156d49bea89d567ed31d42d6 Mon Sep 17 00:00:00 2001
33 +From: Stefan Strogin <steils@g.o>
34 +Date: Wed, 30 Dec 2020 06:48:40 +0300
35 +Subject: [PATCH] Fix build with LibreSSL
36 +
37 +Signed-off-by: Stefan Strogin <steils@g.o>
38 +---
39 + src/socket.c | 2 +-
40 + 1 file changed, 1 insertion(+), 1 deletion(-)
41 +
42 +diff --git a/src/socket.c b/src/socket.c
43 +index aa2ef4f..fa75de4 100644
44 +--- a/src/socket.c
45 ++++ b/src/socket.c
46 +@@ -143,7 +143,7 @@ open_secure_connection(session *ssn)
47 + goto fail;
48 +
49 + if (get_option_boolean("hostnames")) {
50 +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
51 ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
52 + SSL_set_hostflags(ssn->sslconn,
53 + X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
54 + if (!SSL_set1_host(ssn->sslconn, ssn->server)) {
55 +--
56 +2.30.0
57 +
58
59 diff --git a/mail-filter/imapfilter/imapfilter-2.7.5.ebuild b/mail-filter/imapfilter/imapfilter-2.7.5.ebuild
60 new file mode 100644
61 index 00000000000..b894e8eda7c
62 --- /dev/null
63 +++ b/mail-filter/imapfilter/imapfilter-2.7.5.ebuild
64 @@ -0,0 +1,53 @@
65 +# Copyright 1999-2020 Gentoo Authors
66 +# Distributed under the terms of the GNU General Public License v2
67 +
68 +EAPI=7
69 +
70 +LUA_COMPAT=( lua5-{1..3} )
71 +
72 +inherit lua-single toolchain-funcs
73 +
74 +DESCRIPTION="An IMAP mail filtering utility"
75 +HOMEPAGE="https://github.com/lefcha/imapfilter"
76 +SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
77 +
78 +LICENSE="MIT"
79 +SLOT="0"
80 +KEYWORDS="~amd64 ~ppc ~x86"
81 +
82 +IUSE="libressl"
83 +
84 +REQUIRED_USE="${LUA_REQUIRED_USE}"
85 +
86 +RDEPEND="
87 + !libressl? ( dev-libs/openssl:0= )
88 + libressl? ( dev-libs/libressl:0= )
89 + dev-libs/libpcre
90 + ${LUA_DEPS}"
91 +DEPEND="${RDEPEND}"
92 +
93 +DOCS="AUTHORS NEWS README samples/*"
94 +
95 +PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
96 +
97 +src_prepare() {
98 + default
99 + sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
100 + -e "/^MANDIR/s:man:share/man:" \
101 + -e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
102 + -e "/^CFLAGS/s/-O//" \
103 + src/Makefile || die
104 +}
105 +
106 +src_compile() {
107 + emake \
108 + CC="$(tc-getCC)" \
109 + LDFLAGS="${LDFLAGS}" \
110 + INCDIRS=$(lua_get_CFLAGS) \
111 + LIBLUA=$(lua_get_LIBS)
112 +}
113 +
114 +src_install() {
115 + default
116 + doman doc/imapfilter.1 doc/imapfilter_config.5
117 +}