From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A0C321382C5 for ; Wed, 30 Dec 2020 03:54:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AAF20E0BC1; Wed, 30 Dec 2020 03:54:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8C145E0BC1 for ; Wed, 30 Dec 2020 03:54:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A9D634182B for ; Wed, 30 Dec 2020 03:54:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B992FC3 for ; Wed, 30 Dec 2020 03:54:14 +0000 (UTC) From: "Stefan Strogin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Stefan Strogin" Message-ID: <1609300379.eb940ff5f354184c7f53eee7eac50fe372976e71.steils@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/imapfilter/, mail-filter/imapfilter/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-filter/imapfilter/Manifest mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch mail-filter/imapfilter/imapfilter-2.7.5.ebuild X-VCS-Directories: mail-filter/imapfilter/files/ mail-filter/imapfilter/ X-VCS-Committer: steils X-VCS-Committer-Name: Stefan Strogin X-VCS-Revision: eb940ff5f354184c7f53eee7eac50fe372976e71 X-VCS-Branch: master Date: Wed, 30 Dec 2020 03:54:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9439261f-fa70-4528-9d6b-058ab995c4e0 X-Archives-Hash: e5d1ba81ce481d00a60555865e6b384b commit: eb940ff5f354184c7f53eee7eac50fe372976e71 Author: Stefan Strogin gentoo org> AuthorDate: Wed Dec 30 03:52:19 2020 +0000 Commit: Stefan Strogin gentoo org> CommitDate: Wed Dec 30 03:52:59 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb940ff5 mail-filter/imapfilter: upgrade to 2.7.5 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Stefan Strogin gentoo.org> mail-filter/imapfilter/Manifest | 1 + .../files/imapfilter-2.7.5-libressl.patch | 26 +++++++++++ mail-filter/imapfilter/imapfilter-2.7.5.ebuild | 53 ++++++++++++++++++++++ 3 files changed, 80 insertions(+) diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest index f8949b123a0..b6f33917e91 100644 --- a/mail-filter/imapfilter/Manifest +++ b/mail-filter/imapfilter/Manifest @@ -1 +1,2 @@ DIST imapfilter-2.6.16.tar.gz 59636 BLAKE2B 9de58800ab88aa6e22ead001fd4e635b1991d23a2345d729a59438d3774148b1478b561c36848af155da7d15e84afdf900b73054ef268243f333843b71417d1e SHA512 0500931143e593eb69357ef6a6a40be971abadd22d7e807685b88927da8db9a928470f5cad460252b95ccd42efcfd39b5c4001a8796fa79cbd35018405a7be19 +DIST imapfilter-2.7.5.tar.gz 59441 BLAKE2B 0326a698f3be18da47c99cbe20e5e51cde8abcaebf365b3f00e5b1dba6bfaed5139b65766bd447dc596736da504063d5c87c21d1c5c11d6bc7ebd947d9d44835 SHA512 a64747d745ecd5a2f61d486cd8fec1bceeb97ce459ec57454311a960dbfce526c15e8bddeb16860b8efd9710de93845adec61ec892355a0bef7bddc4517e1442 diff --git a/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch b/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch new file mode 100644 index 00000000000..fb665f85271 --- /dev/null +++ b/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch @@ -0,0 +1,26 @@ +From 9a1132d8c8616b67156d49bea89d567ed31d42d6 Mon Sep 17 00:00:00 2001 +From: Stefan Strogin +Date: Wed, 30 Dec 2020 06:48:40 +0300 +Subject: [PATCH] Fix build with LibreSSL + +Signed-off-by: Stefan Strogin +--- + src/socket.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/socket.c b/src/socket.c +index aa2ef4f..fa75de4 100644 +--- a/src/socket.c ++++ b/src/socket.c +@@ -143,7 +143,7 @@ open_secure_connection(session *ssn) + goto fail; + + if (get_option_boolean("hostnames")) { +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + SSL_set_hostflags(ssn->sslconn, + X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS); + if (!SSL_set1_host(ssn->sslconn, ssn->server)) { +-- +2.30.0 + diff --git a/mail-filter/imapfilter/imapfilter-2.7.5.ebuild b/mail-filter/imapfilter/imapfilter-2.7.5.ebuild new file mode 100644 index 00000000000..b894e8eda7c --- /dev/null +++ b/mail-filter/imapfilter/imapfilter-2.7.5.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} ) + +inherit lua-single toolchain-funcs + +DESCRIPTION="An IMAP mail filtering utility" +HOMEPAGE="https://github.com/lefcha/imapfilter" +SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE="libressl" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + dev-libs/libpcre + ${LUA_DEPS}" +DEPEND="${RDEPEND}" + +DOCS="AUTHORS NEWS README samples/*" + +PATCHES=( "${FILESDIR}"/${P}-libressl.patch ) + +src_prepare() { + default + sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \ + -e "/^MANDIR/s:man:share/man:" \ + -e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \ + -e "/^CFLAGS/s/-O//" \ + src/Makefile || die +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + LDFLAGS="${LDFLAGS}" \ + INCDIRS=$(lua_get_CFLAGS) \ + LIBLUA=$(lua_get_LIBS) +} + +src_install() { + default + doman doc/imapfilter.1 doc/imapfilter_config.5 +}