From: "Akinori Hattori" <hattya@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/files/
Date: Tue, 17 Jul 2018 13:47:25 +0000 (UTC) [thread overview]
Message-ID: <1531835220.8b4cdbbea6c56a831eab3dc7c29380f833f5eba9.hattya@gentoo> (raw)
commit: 8b4cdbbea6c56a831eab3dc7c29380f833f5eba9
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 17 13:47:00 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Jul 17 13:47:00 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b4cdbbe
www-servers/h2o: remove unused patch
Package-Manager: Portage-2.3.40, Repoman-2.3.9
www-servers/h2o/files/h2o-2.2.4-libressl.patch | 54 --------------------------
1 file changed, 54 deletions(-)
diff --git a/www-servers/h2o/files/h2o-2.2.4-libressl.patch b/www-servers/h2o/files/h2o-2.2.4-libressl.patch
deleted file mode 100644
index 3849dd0e2b6..00000000000
--- a/www-servers/h2o/files/h2o-2.2.4-libressl.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/include/h2o/openssl_backport.h
-+++ b/include/h2o/openssl_backport.h
-@@ -25,7 +25,7 @@
- #include <stdlib.h>
-
- /* backports for OpenSSL 1.0.2 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-
- #define BIO_get_data(bio) ((bio)->ptr)
- #define BIO_set_data(bio, p) ((bio)->ptr = (p))
-@@ -57,7 +58,7 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char *name)
- #endif
-
- /* backports for OpenSSL 1.0.1 and LibreSSL */
--#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-
- #define SSL_is_server(ssl) ((ssl)->server)
-
---- a/deps/neverbleed/neverbleed.c
-+++ b/deps/neverbleed/neverbleed.c
-@@ -547,7 +547,7 @@ static int sign_stub(struct expbuf_t *buf)
- return 0;
- }
-
--#if !OPENSSL_1_1_API
-+#if !OPENSSL_1_1_API && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-
- static void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
- {
-
---- a/deps/picotls/lib/openssl.c
-+++ b/deps/picotls/lib/openssl.c
-@@ -41,13 +41,15 @@
- #include "picotls.h"
- #include "picotls/openssl.h"
-
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
--#define OPENSSL_1_0_API 1
-+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#define OPENSSL_1_1_API 1
-+#elif defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL
-+#define OPENSSL_1_1_API 1
- #else
--#define OPENSSL_1_0_API 0
-+#define OPENSSL_1_1_API 0
- #endif
-
--#if OPENSSL_1_0_API
-+#if !OPENSSL_1_1_API
-
- #define EVP_PKEY_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_EVP_PKEY)
- #define X509_STORE_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_X509_STORE)
next reply other threads:[~2018-07-17 13:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-17 13:47 Akinori Hattori [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-14 0:31 [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/files/ Sam James
2021-05-03 18:46 Sam James
2018-07-04 13:27 Akinori Hattori
2018-07-04 13:24 Akinori Hattori
2018-07-04 13:24 Akinori Hattori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1531835220.8b4cdbbea6c56a831eab3dc7c29380f833f5eba9.hattya@gentoo \
--to=hattya@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox