net-libs/libesmtp: drop 1.0.6-r3

Bug: https://bugs.gentoo.org/782532
Signed-off-by: John Helmert III <ajak@gentoo.org>
This commit is contained in:
John Helmert III
2021-07-25 22:12:54 -05:00
parent abf6e301e4
commit 00a184a68b
4 changed files with 0 additions and 125 deletions
-1
View File
@@ -1,2 +1 @@
DIST libesmtp-1.0.6.tar.bz2 365506 BLAKE2B 9ce8c9f210e6c41c95bba55a7aec79c176c4582f5dafc1aba4fbf9adb411b75ab89d400ac7a12b7d5d24ede414cb8e2ca306299a2e156515e611d074142cf5e8 SHA512 c122fc5995b76771cce2db58c9e59597cc3a76d273feb6fc26b869f118e91bdf98a5721ee2d1de8175c376af018b5806b0379bbeba2f5da95108916028fd8dda
DIST libesmtp-1.1.0.tar.gz 169134 BLAKE2B 94ef87c65101557f6d60a6bcd7a8b0de638c24d46536ddf602da05c09858780b0a50f9fd8dae1e54a5e9a7826d45fa6da10bad751a9be50475a8f441c94ad455 SHA512 fc2a9d9922a1807cce8c8cee627ea8fd3a79c33f0987c5a487080b1a1659fd504bc45da2f919d30eced33ab3e950105383a46ecf3365493134adc1183eb99e53
@@ -1,72 +0,0 @@
diff --git a/configure.ac b/configure.ac
index 556f220..2c0693d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -303,7 +303,7 @@ if test x$with_openssl != xno ; then
)
fi
if test x$with_openssl != xno ; then
- AC_CHECK_LIB(ssl, SSL_library_init, [
+ AC_CHECK_LIB(ssl, SSL_new, [
with_openssl=yes
LIBS="-lssl -lcrypto $LIBS"
], [
diff --git a/smtp-tls.c b/smtp-tls.c
index 9a66806..cfc6589 100644
--- a/smtp-tls.c
+++ b/smtp-tls.c
@@ -57,6 +57,7 @@ static void *ctx_password_cb_arg;
#ifdef USE_PTHREADS
#include <pthread.h>
static pthread_mutex_t starttls_mutex = PTHREAD_MUTEX_INITIALIZER;
+#if OPENSSL_VERSION_NUMBER < 0x10100000
static pthread_mutex_t *openssl_mutex;
static void
@@ -70,6 +71,7 @@ openssl_mutexcb (int mode, int n,
pthread_mutex_unlock (&openssl_mutex[n]);
}
#endif
+#endif
static int
starttls_init (void)
@@ -77,6 +79,10 @@ starttls_init (void)
if (tls_init)
return 1;
+#if OPENSSL_VERSION_NUMBER < 0x10100000
+ /* starting from OpenSSL 1.1.0, OpenSSL uses a new threading API and does its own locking */
+ /* also initialization has been reworked and is done automatically */
+ /* so there's not much to do here any more */
#ifdef USE_PTHREADS
/* Set up mutexes for the OpenSSL library */
if (openssl_mutex == NULL)
@@ -94,9 +100,10 @@ starttls_init (void)
CRYPTO_set_locking_callback (openssl_mutexcb);
}
#endif
- tls_init = 1;
SSL_load_error_strings ();
SSL_library_init ();
+#endif
+ tls_init = 1;
return 1;
}
@@ -201,7 +208,15 @@ starttls_create_ctx (smtp_session_t session)
3207. Servers typically support SSL as well as TLS because some
versions of Netscape do not support TLS. I am assuming that all
currently deployed servers correctly support TLS. */
+#if OPENSSL_VERSION_NUMBER < 0x10100000
ctx = SSL_CTX_new (TLSv1_client_method ());
+#else
+ ctx = SSL_CTX_new (TLS_client_method ());
+ if (!SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION)) {
+ /* FIXME: set an error code AND free the allocated ctx */
+ return NULL;
+ }
+#endif
/* Load our keys and certificates. To avoid messing with configuration
variables etc, use fixed paths for the certificate store. These are
@@ -1,49 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools
DESCRIPTION="lib that implements the client side of the SMTP protocol"
HOMEPAGE="http://brianstafford.info/libesmtp/"
SRC_URI="http://brianstafford.info/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1 GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="debug ntlm ssl static-libs threads"
RDEPEND="
ssl? (
dev-libs/openssl:0=
)"
DEPEND="${RDEPEND}"
DOCS=( AUTHORS ChangeLog NEWS Notes README TODO )
PATCHES=(
"${FILESDIR}/${P}-openssl-1.1-api-compatibility.patch"
)
src_prepare() {
default
eautoreconf
}
src_configure() {
econf \
--enable-all \
$(use_enable static-libs static) \
$(use_enable ntlm) \
$(use_enable threads pthreads) \
$(use_enable debug) \
$(use_with ssl openssl)
}
src_install() {
default
docinto xml
dodoc doc/api.xml
}
-3
View File
@@ -2,9 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<use>
<flag name="ntlm">Enable support for NTLM authentication</flag>
</use>
<upstream>
<remote-id type="github">libesmtp/libESMTP</remote-id>
</upstream>