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 3DD44138334 for ; Thu, 28 Feb 2019 23:22:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21488E0849; Thu, 28 Feb 2019 23:22:55 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 D279AE0849 for ; Thu, 28 Feb 2019 23:22:54 +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 145A7335D1B for ; Thu, 28 Feb 2019 23:22:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 789C8452 for ; Thu, 28 Feb 2019 23:22:51 +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: <1551396147.25fa03be474841abd9d3f2c959db65886a64c2de.steils@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-libs/libevent/files/, dev-libs/libevent/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: dev-libs/libevent/Manifest dev-libs/libevent/files/libevent-2.1.8-libressl.patch dev-libs/libevent/libevent-2.1.8.ebuild dev-libs/libevent/metadata.xml X-VCS-Directories: dev-libs/libevent/ dev-libs/libevent/files/ X-VCS-Committer: steils X-VCS-Committer-Name: Stefan Strogin X-VCS-Revision: 25fa03be474841abd9d3f2c959db65886a64c2de X-VCS-Branch: master Date: Thu, 28 Feb 2019 23:22:51 +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: 87dcf170-cea6-42df-8986-1ee44eec1fa4 X-Archives-Hash: c35d84cd150c8a3a6446ee23fd905c3b commit: 25fa03be474841abd9d3f2c959db65886a64c2de Author: Stefan Strogin gmail com> AuthorDate: Thu Feb 28 23:22:27 2019 +0000 Commit: Stefan Strogin gmail com> CommitDate: Thu Feb 28 23:22:27 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=25fa03be dev-libs/libevent: drop; fixed upstream and in gentoo.git Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Stefan Strogin gmail.com> dev-libs/libevent/Manifest | 1 - .../libevent/files/libevent-2.1.8-libressl.patch | 93 ---------------------- dev-libs/libevent/libevent-2.1.8.ebuild | 68 ---------------- dev-libs/libevent/metadata.xml | 16 ---- 4 files changed, 178 deletions(-) diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest deleted file mode 100644 index ba25e28..0000000 --- a/dev-libs/libevent/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libevent-2.1.8.tar.gz 1026485 BLAKE2B f1ceb740aa776a7c26f52916d771af7f4bb351cadf858ef991ab015e5897e34579c6af1f4ed3b516d5be2ac7cb3a7c27ac9d3020dbb04ac7670118616a264561 SHA512 a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17 diff --git a/dev-libs/libevent/files/libevent-2.1.8-libressl.patch b/dev-libs/libevent/files/libevent-2.1.8-libressl.patch deleted file mode 100644 index 7614899..0000000 --- a/dev-libs/libevent/files/libevent-2.1.8-libressl.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- a/openssl-compat.h -+++ b/openssl-compat.h -@@ -1,7 +1,8 @@ - #ifndef OPENSSL_COMPAT_H - #define OPENSSL_COMPAT_H - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - - static inline BIO_METHOD *BIO_meth_new(int type, const char *name) - { -@@ -30,6 +31,11 @@ - - #define TLS_method SSLv23_method - --#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) */ -+ -+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L -+#define BIO_get_init(b) (b)->init -+#endif - - #endif /* OPENSSL_COMPAT_H */ ---- a/sample/https-client.c -+++ b/sample/https-client.c -@@ -312,7 +312,8 @@ - } - uri[sizeof(uri) - 1] = '\0'; - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - // Initialize OpenSSL - SSL_library_init(); - ERR_load_crypto_strings(); -@@ -480,7 +481,8 @@ - SSL_CTX_free(ssl_ctx); - if (type == HTTP && ssl) - SSL_free(ssl); --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - EVP_cleanup(); - ERR_free_strings(); - -@@ -492,7 +494,8 @@ - CRYPTO_cleanup_all_ex_data(); - - sk_SSL_COMP_free(SSL_COMP_get_compression_methods()); --#endif /*OPENSSL_VERSION_NUMBER < 0x10100000L */ -+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) */ - - #ifdef _WIN32 - WSACleanup(); ---- a/sample/le-proxy.c -+++ b/sample/le-proxy.c -@@ -259,7 +259,8 @@ - - if (use_ssl) { - int r; --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - SSL_library_init(); - ERR_load_crypto_strings(); - SSL_load_error_strings(); ---- a/sample/openssl_hostname_validation.c -+++ b/sample/openssl_hostname_validation.c -@@ -48,7 +48,8 @@ - - #define HOSTNAME_MAX_SIZE 255 - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - #define ASN1_STRING_get0_data ASN1_STRING_data - #endif - ---- a/test/regress_ssl.c -+++ b/test/regress_ssl.c -@@ -186,7 +186,8 @@ - void - init_ssl(void) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - SSL_library_init(); - ERR_load_crypto_strings(); - SSL_load_error_strings(); diff --git a/dev-libs/libevent/libevent-2.1.8.ebuild b/dev-libs/libevent/libevent-2.1.8.ebuild deleted file mode 100644 index 0e49a85..0000000 --- a/dev-libs/libevent/libevent-2.1.8.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils multilib-minimal - -DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor" -HOMEPAGE="http://libevent.org/ https://github.com/libevent/libevent/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}-stable/${P}-stable.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -# libevent-2.1.so.6 -SLOT="0/2.1-6" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="debug libressl +ssl static-libs test +threads" - -DEPEND=" - ssl? ( - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) - ) -" -RDEPEND=" - ${DEPEND} - !<=dev-libs/9libs-1.0 -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/event2/event-config.h -) - -PATCHES=( "${FILESDIR}"/${P}-libressl.patch ) - -S=${WORKDIR}/${P}-stable - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - # fix out-of-source builds - mkdir -p test || die - - ECONF_SOURCE="${S}" \ - econf \ - --disable-samples \ - $(use_enable debug debug-mode) \ - $(use_enable debug malloc-replacement) \ - $(use_enable ssl openssl) \ - $(use_enable static-libs static) \ - $(use_enable test libevent-regress) \ - $(use_enable threads thread-support) -} - -src_test() { - # The test suite doesn't quite work (see bug #406801 for the latest - # installment in a riveting series of reports). - : - # emake -C test check | tee "${T}"/tests -} - -DOCS=( ChangeLog{,-1.4,-2.0} ) - -multilib_src_install_all() { - einstalldocs - prune_libtool_files -} diff --git a/dev-libs/libevent/metadata.xml b/dev-libs/libevent/metadata.xml deleted file mode 100644 index 6036c10..0000000 --- a/dev-libs/libevent/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - jer@gentoo.org - Jeroen Roovers - - - cpe:/a:niels_provos:libevent - levent - libevent/libevent - - - Support runtime debug mode and malloc hooks (for programmers) - -