* [gentoo-commits] repo/proj/libressl:master commit in: dev-libs/libevent/files/, dev-libs/libevent/
@ 2019-02-28 23:22 Stefan Strogin
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Strogin @ 2019-02-28 23:22 UTC (permalink / raw
To: gentoo-commits
commit: 25fa03be474841abd9d3f2c959db65886a64c2de
Author: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com>
AuthorDate: Thu Feb 28 23:22:27 2019 +0000
Commit: Stefan Strogin <stefan.strogin <AT> gmail <DOT> 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 <stefan.strogin <AT> 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 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>jer@gentoo.org</email>
- <name>Jeroen Roovers</name>
- </maintainer>
- <upstream>
- <remote-id type="cpe">cpe:/a:niels_provos:libevent</remote-id>
- <remote-id type="sourceforge">levent</remote-id>
- <remote-id type="github">libevent/libevent</remote-id>
- </upstream>
- <use>
- <flag name="debug">Support runtime debug mode and malloc hooks (for programmers)</flag>
- </use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/libressl:master commit in: dev-libs/libevent/files/, dev-libs/libevent/
@ 2023-05-03 13:29 orbea
0 siblings, 0 replies; 2+ messages in thread
From: orbea @ 2023-05-03 13:29 UTC (permalink / raw
To: gentoo-commits
commit: c3a987fad184c563fe3cb055f38b0245a015c82d
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Wed May 3 13:26:34 2023 +0000
Commit: orbea <orbea <AT> riseup <DOT> net>
CommitDate: Wed May 3 13:26:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=c3a987fa
dev-libs/libevent: treeclean
Bug: https://bugs.gentoo.org/903001
Upstream-PR: https://github.com/gentoo/gentoo/pull/30840
Upstream-Commit: https://github.com/gentoo/gentoo/commit/339d581366252f59abd7b6a9fe06d4c5c08af0c2
Signed-off-by: orbea <orbea <AT> riseup.net>
dev-libs/libevent/Manifest | 1 -
.../libevent/files/libevent-2.1.12-libressl.patch | 25 -------
dev-libs/libevent/libevent-2.1.12-r1.ebuild | 79 ----------------------
dev-libs/libevent/metadata.xml | 21 ------
4 files changed, 126 deletions(-)
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
deleted file mode 100644
index 204afbb..0000000
--- a/dev-libs/libevent/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libevent-2.1.12.tar.gz 1100847 BLAKE2B bc1ace15f639ecef2e6b3f95976b8830c1d86f1d06606dd949e2978611fdf9859ed4eb9292d13e6e90e3835063edb94aae64a15c518d5dabe680f37d5a7f5290 SHA512 88d8944cd75cbe78bc4e56a6741ca67c017a3686d5349100f1c74f8a68ac0b6410ce64dff160be4a4ba0696ee29540dfed59aaf3c9a02f0c164b00307fcfe84f
diff --git a/dev-libs/libevent/files/libevent-2.1.12-libressl.patch b/dev-libs/libevent/files/libevent-2.1.12-libressl.patch
deleted file mode 100644
index be9e04d..0000000
--- a/dev-libs/libevent/files/libevent-2.1.12-libressl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 883630f76cbf512003b81de25cd96cb75c6cf0f9 Mon Sep 17 00:00:00 2001
-From: Theo Buehler <tb@openbsd.org>
-Date: Sun, 21 Nov 2021 21:38:20 +0100
-Subject: [PATCH] Don't define BIO_get_init() for LibreSSL 3.5+
-
-BIO_get_init() is available in LibreSSL 3.5 and later. The BIO type
-will become opaque, so the existing macro will break the build.
----
- openssl-compat.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/openssl-compat.h b/openssl-compat.h
-index a23e34251b..f5de25539f 100644
---- a/openssl-compat.h
-+++ b/openssl-compat.h
-@@ -40,7 +40,8 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char *name)
- #endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
- (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) */
-
--#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
-+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L && \
-+ LIBRESSL_VERSION_NUMBER < 0x30500000L
- #define BIO_get_init(b) (b)->init
- #endif
-
diff --git a/dev-libs/libevent/libevent-2.1.12-r1.ebuild b/dev-libs/libevent/libevent-2.1.12-r1.ebuild
deleted file mode 100644
index 891b6b3..0000000
--- a/dev-libs/libevent/libevent-2.1.12-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
-HOMEPAGE="
- https://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"
-
-SLOT="0/2.1-7"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="
- +clock-gettime debug malloc-replacement +ssl static-libs test
- verbose-debug
-"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- ssl? (
- >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
- )
-"
-RDEPEND="
- ${DEPEND}
- !<=dev-libs/9libs-1.0
-"
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/event2/event-config.h
-)
-S=${WORKDIR}/${P/_/-}-stable
-
-src_prepare() {
- default
- # bug #767472
- elibtoolize
-
- # LibreSSL 3.5.0 compatibility patch.
- # Will not be necessary in next release of libevent as this patch is
- # already upstream
- eapply "${FILESDIR}/${PN}-2.1.12-libressl.patch"
-}
-
-multilib_src_configure() {
- # fix out-of-source builds
- mkdir -p test || die
-
- ECONF_SOURCE="${S}" \
- econf \
- $(use_enable clock-gettime) \
- $(use_enable debug debug-mode) \
- $(use_enable malloc-replacement malloc-replacement) \
- $(use_enable ssl openssl) \
- $(use_enable static-libs static) \
- $(use_enable test libevent-regress) \
- $(use_enable verbose-debug) \
- --disable-samples
-}
-
-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
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libevent/metadata.xml b/dev-libs/libevent/metadata.xml
deleted file mode 100644
index 382b011..0000000
--- a/dev-libs/libevent/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>mgorny@gentoo.org</email>
- <name>Michał Górny</name>
- </maintainer>
- <upstream>
- <remote-id type="cpe">cpe:/a:niels_provos:libevent</remote-id>
- <remote-id type="github">libevent/libevent</remote-id>
- <remote-id type="sourceforge">levent</remote-id>
- </upstream>
- <use>
- <flag name="clock-gettime">Disable use of clock_gettime even if it is available</flag>
- <flag name="debug">Support for running in debug mode</flag>
- <flag name="malloc-replacement">Support for replacing the memory management functions</flag>
- <flag name="mbedtls">Support for <pkg>net-libs/mbedtls</pkg> encryption</flag>
- <flag name="ssl">Support for <pkg>dev-libs/openssl</pkg> encryption</flag>
- <flag name="verbose-debug">Support for verbose debug logging</flag>
- </use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-03 13:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-03 13:29 [gentoo-commits] repo/proj/libressl:master commit in: dev-libs/libevent/files/, dev-libs/libevent/ orbea
-- strict thread matches above, loose matches on Subject: below --
2019-02-28 23:22 Stefan Strogin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox