Attachment #194637 for bug #228762

Lines 3-10 Link Here

(-)b/www/h2o/Makefile (-2 / +1 lines)
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

Lines 1-3 Link Here

(-)b/www/h2o/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1513347798	1	TIMESTAMP = 1529785115
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




https://github.com/h2o/h2o/issues/1706

--- include/h2o/openssl_backport.h.orig	2017-12-15 03:08:00 UTC
+++ 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 +57,7 @@ static inline BIO_METHOD *BIO_meth_new(i
 #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)
 
--- deps/neverbleed/neverbleed.c.orig	2017-12-15 03:08:00 UTC
+++ deps/neverbleed/neverbleed.c
@@ -547,7 +547,7 @@ static int sign_stub(struct expbuf_t *bu
     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)
 {
--- deps/picotls/lib/openssl.c.orig	2017-12-15 03:08:00 UTC
+++ deps/picotls/lib/openssl.c
@@ -35,13 +35,16 @@
 #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)

Lines 34-43 include/h2o/version.h Link Here

(-)b/www/h2o/pkg-plist (-2 / +2 lines)
34	include/h2o/websocket.h	34	include/h2o/websocket.h
35	lib/libh2o-evloop.so	35	lib/libh2o-evloop.so
36	lib/libh2o-evloop.so.0.13	36	lib/libh2o-evloop.so.0.13
37	lib/libh2o-evloop.so.0.13.4	37	lib/libh2o-evloop.so.0.13.5
38	lib/libh2o.so	38	lib/libh2o.so
39	lib/libh2o.so.0.13	39	lib/libh2o.so.0.13
40	lib/libh2o.so.0.13.4	40	lib/libh2o.so.0.13.5
41	libdata/pkgconfig/libh2o-evloop.pc	41	libdata/pkgconfig/libh2o-evloop.pc
42	libdata/pkgconfig/libh2o.pc	42	libdata/pkgconfig/libh2o.pc
43	%%DATADIR%%/annotate-backtrace-symbols	43	%%DATADIR%%/annotate-backtrace-symbols

Return to bug 228762

Removed Link Here

(-)a/www/h2o/files/patch-issue1706 (-55 lines)
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)