Line 0
Link Here
|
|
|
1 |
diff -ruN /usr/ports/www/h2o/distinfo /root/h2o/distinfo |
2 |
--- /usr/ports/www/h2o/distinfo 2017-12-16 02:40:59.000000000 +0200 |
3 |
+++ /root/h2o/distinfo 2018-06-05 14:54:15.156824000 +0200 |
4 |
@@ -1,3 +1,3 @@ |
5 |
-TIMESTAMP = 1513347798 |
6 |
-SHA256 (h2o-h2o-v2.2.4_GH0.tar.gz) = ebacf3b15f40958c950e18e79ad5a647f61e989c6dbfdeea858ce943ef5e3cd8 |
7 |
-SIZE (h2o-h2o-v2.2.4_GH0.tar.gz) = 16212596 |
8 |
+TIMESTAMP = 1528203255 |
9 |
+SHA256 (h2o-h2o-v2.2.5_GH0.tar.gz) = eafb40aa2d93b3de1af472bb046c17b2335c3e5a894462310e1822e126c97d24 |
10 |
+SIZE (h2o-h2o-v2.2.5_GH0.tar.gz) = 16257295 |
11 |
diff -ruN /usr/ports/www/h2o/files/patch-issue1706 /root/h2o/files/patch-issue1706 |
12 |
--- /usr/ports/www/h2o/files/patch-issue1706 2018-04-22 10:25:23.000000000 +0200 |
13 |
+++ /root/h2o/files/patch-issue1706 1970-01-01 03:00:00.000000000 +0300 |
14 |
@@ -1,55 +0,0 @@ |
15 |
-https://github.com/h2o/h2o/issues/1706 |
16 |
- |
17 |
---- include/h2o/openssl_backport.h.orig 2017-12-15 03:08:00 UTC |
18 |
-+++ include/h2o/openssl_backport.h |
19 |
-@@ -25,7 +25,7 @@ |
20 |
- #include <stdlib.h> |
21 |
- |
22 |
- /* backports for OpenSSL 1.0.2 */ |
23 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
24 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) |
25 |
- |
26 |
- #define BIO_get_data(bio) ((bio)->ptr) |
27 |
- #define BIO_set_data(bio, p) ((bio)->ptr = (p)) |
28 |
-@@ -57,7 +57,7 @@ static inline BIO_METHOD *BIO_meth_new(i |
29 |
- #endif |
30 |
- |
31 |
- /* backports for OpenSSL 1.0.1 and LibreSSL */ |
32 |
--#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER) |
33 |
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) |
34 |
- |
35 |
- #define SSL_is_server(ssl) ((ssl)->server) |
36 |
- |
37 |
---- deps/neverbleed/neverbleed.c.orig 2017-12-15 03:08:00 UTC |
38 |
-+++ deps/neverbleed/neverbleed.c |
39 |
-@@ -547,7 +547,7 @@ static int sign_stub(struct expbuf_t *bu |
40 |
- return 0; |
41 |
- } |
42 |
- |
43 |
--#if !OPENSSL_1_1_API |
44 |
-+#if !OPENSSL_1_1_API && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL) |
45 |
- |
46 |
- static void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) |
47 |
- { |
48 |
---- deps/picotls/lib/openssl.c.orig 2017-12-15 03:08:00 UTC |
49 |
-+++ deps/picotls/lib/openssl.c |
50 |
-@@ -35,13 +35,16 @@ |
51 |
- #include "picotls.h" |
52 |
- #include "picotls/openssl.h" |
53 |
- |
54 |
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) |
55 |
--#define OPENSSL_1_0_API 1 |
56 |
-+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L |
57 |
-+#define OPENSSL_1_1_API 1 |
58 |
-+#elif defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL |
59 |
-+#define OPENSSL_1_1_API 1 |
60 |
- #else |
61 |
- #define OPENSSL_1_0_API 0 |
62 |
-+#define OPENSSL_1_1_API 0 |
63 |
- #endif |
64 |
- |
65 |
--#if OPENSSL_1_0_API |
66 |
-+#if !OPENSSL_1_1_API |
67 |
- |
68 |
- #define EVP_PKEY_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_EVP_PKEY) |
69 |
- #define X509_STORE_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_X509_STORE) |