[gentoo-commits] repo/proj/libressl:master commit in: mail-filter/imapfilter/files/, mail-filter/imapfilter/

[Stefan Strogin]

commit:     1c2868c9314655e232de615a14d22b75bf0dc4be
Author:     Stefan Strogin <stefan.strogin <AT> gmail <DOT> com>
AuthorDate: Thu Feb 28 07:03:46 2019 +0000
Commit:     Stefan Strogin <stefan.strogin <AT> gmail <DOT> com>
CommitDate: Thu Feb 28 07:07:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=1c2868c9

mail-filter/imapfilter: drop; fixed upstream and in gentoo.git

Fixed in:
https://github.com/lefcha/imapfilter/commit/c470c45d1fcb9bf1d51e9ffba6c7be9186dcc6d2
https://github.com/lefcha/imapfilter/commit/9b227c9c67851b279f593b763f5396d782f1d6b9

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Stefan Strogin <stefan.strogin <AT> gmail.com>

 mail-filter/imapfilter/Manifest                    |  1 -
 .../files/imapfilter-2.5.7-no-ssl3.patch           | 53 ----------------------
 mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild  | 45 ------------------
 mail-filter/imapfilter/metadata.xml                | 11 -----
 4 files changed, 110 deletions(-)

diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
deleted file mode 100644
index bc205af..0000000
--- a/mail-filter/imapfilter/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST imapfilter-2.5.7.tar.gz 54861 SHA256 c792d6a3a187cdc14fc38470837b45722a3750dabd2c6f71672806eeef79fad0 SHA512 9297e98812312fbf2c92aa5477bdfecb522048e45b4bc4922e312bd89a72b020a98f5547e3f0882ae665c24db21e6995eda839b762947adc48bc413ab0c882f1 WHIRLPOOL 514507840c9bc4d53823e5233704fb60815fc964bd938acd6bffe7457d786892ba259e84894a3e51e43a710346b55ab9cc4113bbfdf9b66a984438138b37faf0

diff --git a/mail-filter/imapfilter/files/imapfilter-2.5.7-no-ssl3.patch b/mail-filter/imapfilter/files/imapfilter-2.5.7-no-ssl3.patch
deleted file mode 100644
index cc2d34c..0000000
--- a/mail-filter/imapfilter/files/imapfilter-2.5.7-no-ssl3.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- src/imapfilter.c.orig	2014-11-17 00:36:40.000000000 +0000
-+++ src/imapfilter.c	2015-12-27 11:04:14.643145411 +0000
-@@ -21,7 +21,10 @@
- 
- extern buffer ibuf, obuf, nbuf, cbuf;
- extern regexp responses[];
--extern SSL_CTX *ssl3ctx, *ssl23ctx, *tls1ctx;
-+extern SSL_CTX *ssl23ctx, *tls1ctx;
-+#ifndef OPENSSL_NO_SSL3_METHOD
-+extern SSL_CTX *ssl3ctx;
-+#endif
- #if OPENSSL_VERSION_NUMBER >= 0x01000100fL
- extern SSL_CTX *tls11ctx, *tls12ctx;
- #endif
-@@ -51,7 +54,7 @@
- 	opts.config = NULL;
- 	opts.oneline = NULL;
- 	opts.debug = NULL;
--	opts.truststore = "/etc/ssl/certs";
-+	opts.truststore = "/etc/ssl/cert.pem";
- 
- 	env.home = NULL;
- 	env.pathmax = -1;
-@@ -108,7 +111,9 @@
- 
- 	SSL_library_init();
- 	SSL_load_error_strings();
-+#ifndef OPENSSL_NO_SSL3_METHOD
- 	ssl3ctx = SSL_CTX_new(SSLv3_client_method());
-+#endif
- 	ssl23ctx = SSL_CTX_new(SSLv23_client_method());
- 	tls1ctx = SSL_CTX_new(TLSv1_client_method());
- #if OPENSSL_VERSION_NUMBER >= 0x01000100fL
-@@ -116,7 +121,9 @@
- 	tls12ctx = SSL_CTX_new(TLSv1_2_client_method());
- #endif
- 	if (exists_dir(opts.truststore)) {
-+#ifndef OPENSSL_NO_SSL3_METHOD
- 		SSL_CTX_load_verify_locations(ssl3ctx, NULL, opts.truststore);
-+#endif
- 		SSL_CTX_load_verify_locations(ssl23ctx, NULL, opts.truststore);
- 		SSL_CTX_load_verify_locations(tls1ctx, NULL, opts.truststore);
- #if OPENSSL_VERSION_NUMBER >= 0x01000100fL
-@@ -142,7 +149,9 @@
- #endif
- 	stop_lua();
- 
-+#ifndef OPENSSL_NO_SSL3_METHOD
- 	SSL_CTX_free(ssl3ctx);
-+#endif
- 	SSL_CTX_free(ssl23ctx);
- 	SSL_CTX_free(tls1ctx);
- #if OPENSSL_VERSION_NUMBER >= 0x01000100fL

diff --git a/mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild b/mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild
deleted file mode 100644
index 57c78e0..0000000
--- a/mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch toolchain-funcs
-
-DESCRIPTION="An IMAP mail filtering utility"
-HOMEPAGE="http://imapfilter.hellug.gr"
-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"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	dev-libs/libpcre
-	dev-lang/lua:*"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README samples/*"
-
-src_prepare() {
-	# Fix for LibreSSL >= 2.3.0
-	epatch "${FILESDIR}"/${PN}-2.5.7-no-ssl3.patch
-
-	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}"
-}
-
-src_install() {
-	default
-	doman doc/imapfilter.1 doc/imapfilter_config.5
-}

diff --git a/mail-filter/imapfilter/metadata.xml b/mail-filter/imapfilter/metadata.xml
deleted file mode 100644
index a925f33..0000000
--- a/mail-filter/imapfilter/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>net-mail@g.o</email>
-		<name>Net-Mail</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">lefcha/imapfilter</remote-id>
-	</upstream>
-</pkgmetadata>