View | Details | Raw Unified | Return to bug 228762 | Differences between
and this patch

Collapse All | Expand All

(-)/root/h2o/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1513347798
1
TIMESTAMP = 1528203255
2
SHA256 (h2o-h2o-v2.2.4_GH0.tar.gz) = ebacf3b15f40958c950e18e79ad5a647f61e989c6dbfdeea858ce943ef5e3cd8
2
SHA256 (h2o-h2o-v2.2.5_GH0.tar.gz) = eafb40aa2d93b3de1af472bb046c17b2335c3e5a894462310e1822e126c97d24
3
SIZE (h2o-h2o-v2.2.4_GH0.tar.gz) = 16212596
3
SIZE (h2o-h2o-v2.2.5_GH0.tar.gz) = 16257295
(-)/root/h2o/files/patch-issue1706 (-55 lines)
Lines 1-55 Link Here
1
https://github.com/h2o/h2o/issues/1706
2
3
--- include/h2o/openssl_backport.h.orig	2017-12-15 03:08:00 UTC
4
+++ include/h2o/openssl_backport.h
5
@@ -25,7 +25,7 @@
6
 #include <stdlib.h>
7
 
8
 /* backports for OpenSSL 1.0.2 */
9
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
10
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
11
 
12
 #define BIO_get_data(bio) ((bio)->ptr)
13
 #define BIO_set_data(bio, p) ((bio)->ptr = (p))
14
@@ -57,7 +57,7 @@ static inline BIO_METHOD *BIO_meth_new(i
15
 #endif
16
 
17
 /* backports for OpenSSL 1.0.1 and LibreSSL */
18
-#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
19
+#if OPENSSL_VERSION_NUMBER < 0x10002000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
20
 
21
 #define SSL_is_server(ssl) ((ssl)->server)
22
 
23
--- deps/neverbleed/neverbleed.c.orig	2017-12-15 03:08:00 UTC
24
+++ deps/neverbleed/neverbleed.c
25
@@ -547,7 +547,7 @@ static int sign_stub(struct expbuf_t *bu
26
     return 0;
27
 }
28
 
29
-#if !OPENSSL_1_1_API
30
+#if !OPENSSL_1_1_API && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL)
31
 
32
 static void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
33
 {
34
--- deps/picotls/lib/openssl.c.orig	2017-12-15 03:08:00 UTC
35
+++ deps/picotls/lib/openssl.c
36
@@ -35,13 +35,16 @@
37
 #include "picotls.h"
38
 #include "picotls/openssl.h"
39
 
40
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
41
-#define OPENSSL_1_0_API 1
42
+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
43
+#define OPENSSL_1_1_API 1
44
+#elif defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL
45
+#define OPENSSL_1_1_API 1
46
 #else
47
 #define OPENSSL_1_0_API 0
48
+#define OPENSSL_1_1_API 0
49
 #endif
50
 
51
-#if OPENSSL_1_0_API
52
+#if !OPENSSL_1_1_API
53
 
54
 #define EVP_PKEY_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_EVP_PKEY)
55
 #define X509_STORE_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_X509_STORE)
(-)/root/h2o/h2o-2.2.5.dif (+69 lines)
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)
(-)/root/h2o/Makefile (-2 / +1 lines)
Lines 3-10 Link Here
3
3
4
PORTNAME=	h2o
4
PORTNAME=	h2o
5
DISTVERSIONPREFIX=	v
5
DISTVERSIONPREFIX=	v
6
DISTVERSION=	2.2.4
6
DISTVERSION=	2.2.5
7
PORTREVISION=	1
8
CATEGORIES=	www
7
CATEGORIES=	www
9
8
10
MAINTAINER=	dch@FreeBSD.org
9
MAINTAINER=	dch@FreeBSD.org
(-)/root/h2o/pkg-plist (-19 / +19 lines)
Lines 1-4 Link Here
1
bin/h2o
1
bin/h2o
2
%%ETCDIR%%/h2o.conf.sample
2
include/h2o.h
3
include/h2o.h
3
include/h2o/cache.h
4
include/h2o/cache.h
4
include/h2o/cache_digests.h
5
include/h2o/cache_digests.h
Lines 34-60 Link Here
34
include/h2o/websocket.h
35
include/h2o/websocket.h
35
lib/libh2o-evloop.so
36
lib/libh2o-evloop.so
36
lib/libh2o-evloop.so.0.13
37
lib/libh2o-evloop.so.0.13
37
lib/libh2o-evloop.so.0.13.4
38
lib/libh2o-evloop.so.0.13.5
38
lib/libh2o.so
39
lib/libh2o.so
39
lib/libh2o.so.0.13
40
lib/libh2o.so.0.13
40
lib/libh2o.so.0.13.4
41
lib/libh2o.so.0.13.5
41
libdata/pkgconfig/libh2o-evloop.pc
42
libdata/pkgconfig/libh2o-evloop.pc
42
libdata/pkgconfig/libh2o.pc
43
libdata/pkgconfig/libh2o.pc
43
%%DATADIR%%/annotate-backtrace-symbols
44
%%DATADIR%%/fetch-ocsp-response
45
%%DATADIR%%/kill-on-close
46
%%DATADIR%%/start_server
47
%%DATADIR%%/ca-bundle.crt
48
%%DATADIR%%/fastcgi-cgi
49
%%DATADIR%%/setuidgid
50
%%DATADIR%%/status/index.html
51
%%MRUBY%%%%DATADIR%%/mruby/acl.rb
52
%%MRUBY%%%%DATADIR%%/mruby/bootstrap.rb
53
%%MRUBY%%%%DATADIR%%/mruby/dos_detector.rb
54
%%MRUBY%%%%DATADIR%%/mruby/htpasswd.rb
55
%%MRUBY%%%%DATADIR%%/mruby/lru_cache.rb
56
%%MRUBY%%%%DATADIR%%/mruby/preloads.rb
57
%%MRUBY%%%%DATADIR%%/mruby/trie_addr.rb
58
%%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png
44
%%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png
59
%%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png
45
%%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png
60
%%PORTDOCS%%%%DOCSDIR%%/assets/remotebench.png
46
%%PORTDOCS%%%%DOCSDIR%%/assets/remotebench.png
Lines 108-112 Link Here
108
%%PORTDOCS%%%%DOCSDIR%%/search/oktavia-english-search.js
94
%%PORTDOCS%%%%DOCSDIR%%/search/oktavia-english-search.js
109
%%PORTDOCS%%%%DOCSDIR%%/search/oktavia-jquery-ui.js
95
%%PORTDOCS%%%%DOCSDIR%%/search/oktavia-jquery-ui.js
110
%%PORTDOCS%%%%DOCSDIR%%/search/searchindex.js
96
%%PORTDOCS%%%%DOCSDIR%%/search/searchindex.js
111
@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
97
%%DATADIR%%/annotate-backtrace-symbols
112
@sample %%ETCDIR%%/h2o.conf.sample
98
%%DATADIR%%/ca-bundle.crt
99
%%DATADIR%%/fastcgi-cgi
100
%%DATADIR%%/fetch-ocsp-response
101
%%DATADIR%%/kill-on-close
102
%%DATADIR%%/mruby/acl.rb
103
%%DATADIR%%/mruby/bootstrap.rb
104
%%DATADIR%%/mruby/dos_detector.rb
105
%%DATADIR%%/mruby/htpasswd.rb
106
%%DATADIR%%/mruby/lru_cache.rb
107
%%DATADIR%%/mruby/preloads.rb
108
%%DATADIR%%/mruby/trie_addr.rb
109
%%DATADIR%%/setuidgid
110
%%DATADIR%%/start_server
111
%%DATADIR%%/status/index.html
112
@dir /var/log/h2o

Return to bug 228762