Attachment 194020 Details for Bug 228762 – diff to 2.2.5

[patch] diff to 2.2.5

h2o-2.2.5.diff (text/plain), 8.24 KB, created by Max Kostikov on 2018-06-05 13:55:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Max Kostikov

Created: 2018-06-05 13:55:10 UTC

Size: 8.24 KB

patch

obsolete

>diff -ruN /usr/ports/www/h2o/distinfo /root/h2o/distinfo
>--- /usr/ports/www/h2o/distinfo	2017-12-16 02:40:59.000000000 +0200
>+++ /root/h2o/distinfo	2018-06-05 14:54:15.156824000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1513347798
>-SHA256 (h2o-h2o-v2.2.4_GH0.tar.gz) = ebacf3b15f40958c950e18e79ad5a647f61e989c6dbfdeea858ce943ef5e3cd8
>-SIZE (h2o-h2o-v2.2.4_GH0.tar.gz) = 16212596
>+TIMESTAMP = 1528203255
>+SHA256 (h2o-h2o-v2.2.5_GH0.tar.gz) = eafb40aa2d93b3de1af472bb046c17b2335c3e5a894462310e1822e126c97d24
>+SIZE (h2o-h2o-v2.2.5_GH0.tar.gz) = 16257295
>diff -ruN /usr/ports/www/h2o/files/patch-issue1706 /root/h2o/files/patch-issue1706
>--- /usr/ports/www/h2o/files/patch-issue1706	2018-04-22 10:25:23.000000000 +0200
>+++ /root/h2o/files/patch-issue1706	1970-01-01 03:00:00.000000000 +0300
>@@ -1,55 +0,0 @@
>-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)
>diff -ruN /usr/ports/www/h2o/h2o-2.2.5.dif /root/h2o/h2o-2.2.5.dif
>--- /usr/ports/www/h2o/h2o-2.2.5.dif	1970-01-01 03:00:00.000000000 +0300
>+++ /root/h2o/h2o-2.2.5.dif	2018-06-05 15:49:26.936456000 +0200
>@@ -0,0 +1,69 @@
>+diff -ruN /usr/ports/www/h2o/distinfo /root/h2o/distinfo
>+--- /usr/ports/www/h2o/distinfo	2017-12-16 02:40:59.000000000 +0200
>++++ /root/h2o/distinfo	2018-06-05 14:54:15.156824000 +0200
>+@@ -1,3 +1,3 @@
>+-TIMESTAMP = 1513347798
>+-SHA256 (h2o-h2o-v2.2.4_GH0.tar.gz) = ebacf3b15f40958c950e18e79ad5a647f61e989c6dbfdeea858ce943ef5e3cd8
>+-SIZE (h2o-h2o-v2.2.4_GH0.tar.gz) = 16212596
>++TIMESTAMP = 1528203255
>++SHA256 (h2o-h2o-v2.2.5_GH0.tar.gz) = eafb40aa2d93b3de1af472bb046c17b2335c3e5a894462310e1822e126c97d24
>++SIZE (h2o-h2o-v2.2.5_GH0.tar.gz) = 16257295
>+diff -ruN /usr/ports/www/h2o/files/patch-issue1706 /root/h2o/files/patch-issue1706
>+--- /usr/ports/www/h2o/files/patch-issue1706	2018-04-22 10:25:23.000000000 +0200
>++++ /root/h2o/files/patch-issue1706	1970-01-01 03:00:00.000000000 +0300
>+@@ -1,55 +0,0 @@
>+-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)
>diff -ruN /usr/ports/www/h2o/Makefile /root/h2o/Makefile
>--- /usr/ports/www/h2o/Makefile	2018-06-02 22:05:45.000000000 +0200
>+++ /root/h2o/Makefile	2018-06-05 15:33:32.443151000 +0200
>@@ -3,8 +3,7 @@
> 
> PORTNAME=	h2o
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	2.2.4
>-PORTREVISION=	1
>+DISTVERSION=	2.2.5
> CATEGORIES=	www
> 
> MAINTAINER=	dch@FreeBSD.org
>diff -ruN /usr/ports/www/h2o/pkg-plist /root/h2o/pkg-plist
>--- /usr/ports/www/h2o/pkg-plist	2018-06-02 22:05:45.000000000 +0200
>+++ /root/h2o/pkg-plist	2018-06-05 15:38:53.833849000 +0200
>@@ -1,4 +1,5 @@
> bin/h2o
>+%%ETCDIR%%/h2o.conf.sample
> include/h2o.h
> include/h2o/cache.h
> include/h2o/cache_digests.h
>@@ -34,27 +35,12 @@
> include/h2o/websocket.h
> lib/libh2o-evloop.so
> lib/libh2o-evloop.so.0.13
>-lib/libh2o-evloop.so.0.13.4
>+lib/libh2o-evloop.so.0.13.5
> lib/libh2o.so
> lib/libh2o.so.0.13
>-lib/libh2o.so.0.13.4
>+lib/libh2o.so.0.13.5
> libdata/pkgconfig/libh2o-evloop.pc
> libdata/pkgconfig/libh2o.pc
>-%%DATADIR%%/annotate-backtrace-symbols
>-%%DATADIR%%/fetch-ocsp-response
>-%%DATADIR%%/kill-on-close
>-%%DATADIR%%/start_server
>-%%DATADIR%%/ca-bundle.crt
>-%%DATADIR%%/fastcgi-cgi
>-%%DATADIR%%/setuidgid
>-%%DATADIR%%/status/index.html
>-%%MRUBY%%%%DATADIR%%/mruby/acl.rb
>-%%MRUBY%%%%DATADIR%%/mruby/bootstrap.rb
>-%%MRUBY%%%%DATADIR%%/mruby/dos_detector.rb
>-%%MRUBY%%%%DATADIR%%/mruby/htpasswd.rb
>-%%MRUBY%%%%DATADIR%%/mruby/lru_cache.rb
>-%%MRUBY%%%%DATADIR%%/mruby/preloads.rb
>-%%MRUBY%%%%DATADIR%%/mruby/trie_addr.rb
> %%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png
> %%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png
> %%PORTDOCS%%%%DOCSDIR%%/assets/remotebench.png
>@@ -108,5 +94,19 @@
> %%PORTDOCS%%%%DOCSDIR%%/search/oktavia-english-search.js
> %%PORTDOCS%%%%DOCSDIR%%/search/oktavia-jquery-ui.js
> %%PORTDOCS%%%%DOCSDIR%%/search/searchindex.js
>-@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
>-@sample %%ETCDIR%%/h2o.conf.sample
>+%%DATADIR%%/annotate-backtrace-symbols
>+%%DATADIR%%/ca-bundle.crt
>+%%DATADIR%%/fastcgi-cgi
>+%%DATADIR%%/fetch-ocsp-response
>+%%DATADIR%%/kill-on-close
>+%%DATADIR%%/mruby/acl.rb
>+%%DATADIR%%/mruby/bootstrap.rb
>+%%DATADIR%%/mruby/dos_detector.rb
>+%%DATADIR%%/mruby/htpasswd.rb
>+%%DATADIR%%/mruby/lru_cache.rb
>+%%DATADIR%%/mruby/preloads.rb
>+%%DATADIR%%/mruby/trie_addr.rb
>+%%DATADIR%%/setuidgid
>+%%DATADIR%%/start_server
>+%%DATADIR%%/status/index.html
>+@dir /var/log/h2o

Flags:

dch: maintainer-approval+

Actions: View | Diff

Attachments on bug 228762: 194020 | 194637