1 |
commit: 25fa03be474841abd9d3f2c959db65886a64c2de |
2 |
Author: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Feb 28 23:22:27 2019 +0000 |
4 |
Commit: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com> |
5 |
CommitDate: Thu Feb 28 23:22:27 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=25fa03be |
7 |
|
8 |
dev-libs/libevent: drop; fixed upstream and in gentoo.git |
9 |
|
10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
11 |
Signed-off-by: Stefan Strogin <stefan.strogin <AT> gmail.com> |
12 |
|
13 |
dev-libs/libevent/Manifest | 1 - |
14 |
.../libevent/files/libevent-2.1.8-libressl.patch | 93 ---------------------- |
15 |
dev-libs/libevent/libevent-2.1.8.ebuild | 68 ---------------- |
16 |
dev-libs/libevent/metadata.xml | 16 ---- |
17 |
4 files changed, 178 deletions(-) |
18 |
|
19 |
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest |
20 |
deleted file mode 100644 |
21 |
index ba25e28..0000000 |
22 |
--- a/dev-libs/libevent/Manifest |
23 |
+++ /dev/null |
24 |
@@ -1 +0,0 @@ |
25 |
-DIST libevent-2.1.8.tar.gz 1026485 BLAKE2B f1ceb740aa776a7c26f52916d771af7f4bb351cadf858ef991ab015e5897e34579c6af1f4ed3b516d5be2ac7cb3a7c27ac9d3020dbb04ac7670118616a264561 SHA512 a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17 |
26 |
|
27 |
diff --git a/dev-libs/libevent/files/libevent-2.1.8-libressl.patch b/dev-libs/libevent/files/libevent-2.1.8-libressl.patch |
28 |
deleted file mode 100644 |
29 |
index 7614899..0000000 |
30 |
--- a/dev-libs/libevent/files/libevent-2.1.8-libressl.patch |
31 |
+++ /dev/null |
32 |
@@ -1,93 +0,0 @@ |
33 |
---- a/openssl-compat.h |
34 |
-+++ b/openssl-compat.h |
35 |
-@@ -1,7 +1,8 @@ |
36 |
- #ifndef OPENSSL_COMPAT_H |
37 |
- #define OPENSSL_COMPAT_H |
38 |
- |
39 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
40 |
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ |
41 |
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) |
42 |
- |
43 |
- static inline BIO_METHOD *BIO_meth_new(int type, const char *name) |
44 |
- { |
45 |
-@@ -30,6 +31,11 @@ |
46 |
- |
47 |
- #define TLS_method SSLv23_method |
48 |
- |
49 |
--#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ |
50 |
-+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ |
51 |
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) */ |
52 |
-+ |
53 |
-+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L |
54 |
-+#define BIO_get_init(b) (b)->init |
55 |
-+#endif |
56 |
- |
57 |
- #endif /* OPENSSL_COMPAT_H */ |
58 |
---- a/sample/https-client.c |
59 |
-+++ b/sample/https-client.c |
60 |
-@@ -312,7 +312,8 @@ |
61 |
- } |
62 |
- uri[sizeof(uri) - 1] = '\0'; |
63 |
- |
64 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
65 |
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ |
66 |
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) |
67 |
- // Initialize OpenSSL |
68 |
- SSL_library_init(); |
69 |
- ERR_load_crypto_strings(); |
70 |
-@@ -480,7 +481,8 @@ |
71 |
- SSL_CTX_free(ssl_ctx); |
72 |
- if (type == HTTP && ssl) |
73 |
- SSL_free(ssl); |
74 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
75 |
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ |
76 |
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) |
77 |
- EVP_cleanup(); |
78 |
- ERR_free_strings(); |
79 |
- |
80 |
-@@ -492,7 +494,8 @@ |
81 |
- CRYPTO_cleanup_all_ex_data(); |
82 |
- |
83 |
- sk_SSL_COMP_free(SSL_COMP_get_compression_methods()); |
84 |
--#endif /*OPENSSL_VERSION_NUMBER < 0x10100000L */ |
85 |
-+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ |
86 |
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) */ |
87 |
- |
88 |
- #ifdef _WIN32 |
89 |
- WSACleanup(); |
90 |
---- a/sample/le-proxy.c |
91 |
-+++ b/sample/le-proxy.c |
92 |
-@@ -259,7 +259,8 @@ |
93 |
- |
94 |
- if (use_ssl) { |
95 |
- int r; |
96 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
97 |
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ |
98 |
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) |
99 |
- SSL_library_init(); |
100 |
- ERR_load_crypto_strings(); |
101 |
- SSL_load_error_strings(); |
102 |
---- a/sample/openssl_hostname_validation.c |
103 |
-+++ b/sample/openssl_hostname_validation.c |
104 |
-@@ -48,7 +48,8 @@ |
105 |
- |
106 |
- #define HOSTNAME_MAX_SIZE 255 |
107 |
- |
108 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
109 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ |
110 |
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) |
111 |
- #define ASN1_STRING_get0_data ASN1_STRING_data |
112 |
- #endif |
113 |
- |
114 |
---- a/test/regress_ssl.c |
115 |
-+++ b/test/regress_ssl.c |
116 |
-@@ -186,7 +186,8 @@ |
117 |
- void |
118 |
- init_ssl(void) |
119 |
- { |
120 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
121 |
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ |
122 |
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) |
123 |
- SSL_library_init(); |
124 |
- ERR_load_crypto_strings(); |
125 |
- SSL_load_error_strings(); |
126 |
|
127 |
diff --git a/dev-libs/libevent/libevent-2.1.8.ebuild b/dev-libs/libevent/libevent-2.1.8.ebuild |
128 |
deleted file mode 100644 |
129 |
index 0e49a85..0000000 |
130 |
--- a/dev-libs/libevent/libevent-2.1.8.ebuild |
131 |
+++ /dev/null |
132 |
@@ -1,68 +0,0 @@ |
133 |
-# Copyright 1999-2018 Gentoo Foundation |
134 |
-# Distributed under the terms of the GNU General Public License v2 |
135 |
- |
136 |
-EAPI=6 |
137 |
-inherit autotools eutils multilib-minimal |
138 |
- |
139 |
-DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor" |
140 |
-HOMEPAGE="http://libevent.org/ https://github.com/libevent/libevent/" |
141 |
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}-stable/${P}-stable.tar.gz -> ${P}.tar.gz" |
142 |
- |
143 |
-LICENSE="BSD" |
144 |
-# libevent-2.1.so.6 |
145 |
-SLOT="0/2.1-6" |
146 |
-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" |
147 |
-IUSE="debug libressl +ssl static-libs test +threads" |
148 |
- |
149 |
-DEPEND=" |
150 |
- ssl? ( |
151 |
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) |
152 |
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) |
153 |
- ) |
154 |
-" |
155 |
-RDEPEND=" |
156 |
- ${DEPEND} |
157 |
- !<=dev-libs/9libs-1.0 |
158 |
-" |
159 |
- |
160 |
-MULTILIB_WRAPPED_HEADERS=( |
161 |
- /usr/include/event2/event-config.h |
162 |
-) |
163 |
- |
164 |
-PATCHES=( "${FILESDIR}"/${P}-libressl.patch ) |
165 |
- |
166 |
-S=${WORKDIR}/${P}-stable |
167 |
- |
168 |
-src_prepare() { |
169 |
- default |
170 |
- eautoreconf |
171 |
-} |
172 |
- |
173 |
-multilib_src_configure() { |
174 |
- # fix out-of-source builds |
175 |
- mkdir -p test || die |
176 |
- |
177 |
- ECONF_SOURCE="${S}" \ |
178 |
- econf \ |
179 |
- --disable-samples \ |
180 |
- $(use_enable debug debug-mode) \ |
181 |
- $(use_enable debug malloc-replacement) \ |
182 |
- $(use_enable ssl openssl) \ |
183 |
- $(use_enable static-libs static) \ |
184 |
- $(use_enable test libevent-regress) \ |
185 |
- $(use_enable threads thread-support) |
186 |
-} |
187 |
- |
188 |
-src_test() { |
189 |
- # The test suite doesn't quite work (see bug #406801 for the latest |
190 |
- # installment in a riveting series of reports). |
191 |
- : |
192 |
- # emake -C test check | tee "${T}"/tests |
193 |
-} |
194 |
- |
195 |
-DOCS=( ChangeLog{,-1.4,-2.0} ) |
196 |
- |
197 |
-multilib_src_install_all() { |
198 |
- einstalldocs |
199 |
- prune_libtool_files |
200 |
-} |
201 |
|
202 |
diff --git a/dev-libs/libevent/metadata.xml b/dev-libs/libevent/metadata.xml |
203 |
deleted file mode 100644 |
204 |
index 6036c10..0000000 |
205 |
--- a/dev-libs/libevent/metadata.xml |
206 |
+++ /dev/null |
207 |
@@ -1,16 +0,0 @@ |
208 |
-<?xml version='1.0' encoding='UTF-8'?> |
209 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
210 |
-<pkgmetadata> |
211 |
- <maintainer type="person"> |
212 |
- <email>jer@g.o</email> |
213 |
- <name>Jeroen Roovers</name> |
214 |
- </maintainer> |
215 |
- <upstream> |
216 |
- <remote-id type="cpe">cpe:/a:niels_provos:libevent</remote-id> |
217 |
- <remote-id type="sourceforge">levent</remote-id> |
218 |
- <remote-id type="github">libevent/libevent</remote-id> |
219 |
- </upstream> |
220 |
- <use> |
221 |
- <flag name="debug">Support runtime debug mode and malloc hooks (for programmers)</flag> |
222 |
- </use> |
223 |
-</pkgmetadata> |