diff -Nru h2o-2.2.5+dfsg1/debian/changelog h2o-2.2.5+dfsg2/debian/changelog --- h2o-2.2.5+dfsg1/debian/changelog 2018-06-04 21:40:06.000000000 +0000 +++ h2o-2.2.5+dfsg2/debian/changelog 2018-10-01 19:55:29.000000000 +0000 @@ -1,3 +1,22 @@ +h2o (2.2.5+dfsg2-2) unstable; urgency=medium + + * Rebuild against new wslay + + -- Anton Gladky Mon, 01 Oct 2018 21:55:29 +0200 + +h2o (2.2.5+dfsg2-1) unstable; urgency=medium + + * d/watch: mangle upstream alpha/beta/rc versions. + * Modify upstream source to use the system's jquery and repack, bumping dfsg + revision in the process. + * Disable some tests broken by unexpected TLSv1.3 client support and force + TLSv1.2 on all s_client test invocations. (Closes: #908136) + * Link libh2o and libh2o-evloop against libwslay. (Closes: #908124) + * Bump Standards-Version to 4.2.1; no changes needed. + * d/rules: respect the nocheck build option. + + -- Apollon Oikonomopoulos Sat, 22 Sep 2018 23:33:20 +0300 + h2o (2.2.5+dfsg1-6) unstable; urgency=medium * [e77f4db] Add sleep between server creation and client connection diff -Nru h2o-2.2.5+dfsg1/debian/control h2o-2.2.5+dfsg2/debian/control --- h2o-2.2.5+dfsg1/debian/control 2018-05-02 21:36:45.000000000 +0000 +++ h2o-2.2.5+dfsg2/debian/control 2018-10-01 19:37:17.000000000 +0000 @@ -24,7 +24,7 @@ starlet, wget, zlib1g-dev -Standards-Version: 4.1.3 +Standards-Version: 4.2.1 Vcs-Browser: https://salsa.debian.org/debian/h2o Vcs-Git: https://salsa.debian.org/debian/h2o.git Homepage: https://h2o.examp1e.net diff -Nru h2o-2.2.5+dfsg1/debian/patches/link-libh2o-with-wslay.patch h2o-2.2.5+dfsg2/debian/patches/link-libh2o-with-wslay.patch --- h2o-2.2.5+dfsg1/debian/patches/link-libh2o-with-wslay.patch 1970-01-01 00:00:00.000000000 +0000 +++ h2o-2.2.5+dfsg2/debian/patches/link-libh2o-with-wslay.patch 2018-10-01 19:37:17.000000000 +0000 @@ -0,0 +1,19 @@ +Author: Apollon Oikonomopoulos +Description: Link libh2o and libh2o-evloop against wslay +Bug-Debian: https://bugs.debian.org/908124 +Last-Update: 2018-09-22 +Forwarded: no +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -396,6 +396,11 @@ + SOVERSION ${LIBRARY_SOVERSION}) + TARGET_LINK_LIBRARIES(libh2o-evloop ${EXTRA_LIBS}) + ++IF (WSLAY_FOUND) ++ TARGET_LINK_LIBRARIES(libh2o ${WSLAY_LIBRARIES}) ++ TARGET_LINK_LIBRARIES(libh2o-evloop ${WSLAY_LIBRARIES}) ++ENDIF (WSLAY_FOUND) ++ + IF (OPENSSL_FOUND) + TARGET_INCLUDE_DIRECTORIES(libh2o PUBLIC ${OPENSSL_INCLUDE_DIR}) + TARGET_INCLUDE_DIRECTORIES(libh2o-evloop PUBLIC ${OPENSSL_INCLUDE_DIR}) diff -Nru h2o-2.2.5+dfsg1/debian/patches/series h2o-2.2.5+dfsg2/debian/patches/series --- h2o-2.2.5+dfsg1/debian/patches/series 2018-05-02 21:24:53.000000000 +0000 +++ h2o-2.2.5+dfsg2/debian/patches/series 2018-10-01 19:37:17.000000000 +0000 @@ -1,3 +1,5 @@ link-against-system-libyaml.patch use-etc-ssl-certs.patch link-against-wslay.patch +tests-force-TLSv1.2-on-s_client-invocations.patch +link-libh2o-with-wslay.patch diff -Nru h2o-2.2.5+dfsg1/debian/patches/tests-force-TLSv1.2-on-s_client-invocations.patch h2o-2.2.5+dfsg2/debian/patches/tests-force-TLSv1.2-on-s_client-invocations.patch --- h2o-2.2.5+dfsg1/debian/patches/tests-force-TLSv1.2-on-s_client-invocations.patch 1970-01-01 00:00:00.000000000 +0000 +++ h2o-2.2.5+dfsg2/debian/patches/tests-force-TLSv1.2-on-s_client-invocations.patch 2018-10-01 19:37:17.000000000 +0000 @@ -0,0 +1,58 @@ +From 752caaf33bf5a752bf2926aa32a1f8851a023fbf Mon Sep 17 00:00:00 2001 +From: Apollon Oikonomopoulos +Date: Fri, 14 Sep 2018 16:44:34 +0300 +Subject: [PATCH] Tests: force TLSv1.2 on s_client invocations + +The tests are not ready (yet) to handle TLSv1.3 support in OpenSSL, so +make s_client use TLSv1.2 explicitly. + +Note that we could pass -no_tls1_3 instead, but this would break with +older (pre-1.1.1) OpenSSL versions. +--- + t/40memcached-session-resumption.t | 2 +- + t/40session-ticket.t | 2 +- + t/40ssl-cipher-suite.t | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/t/40memcached-session-resumption.t b/t/40memcached-session-resumption.t +index 129affbe..6774bece 100644 +--- a/t/40memcached-session-resumption.t ++++ b/t/40memcached-session-resumption.t +@@ -47,7 +47,7 @@ hosts: + file.dir: @{[ DOC_ROOT ]} + EOT + my $lines = do { +- open my $fh, "-|", "openssl s_client -no_ticket $opts -connect 127.0.0.1:$server->{tls_port} 2>&1 < /dev/null" ++ open my $fh, "-|", "openssl s_client -tls1_2 -no_ticket $opts -connect 127.0.0.1:$server->{tls_port} 2>&1 < /dev/null" + or die "failed to open pipe:$!"; + local $/; + <$fh>; +diff --git a/t/40session-ticket.t b/t/40session-ticket.t +index 2e5d5e4a..e712ef18 100644 +--- a/t/40session-ticket.t ++++ b/t/40session-ticket.t +@@ -122,7 +122,7 @@ EOT + sub test { + my $lines = do { + my $cmd_opts = (-e "$tempdir/session" ? "-sess_in $tempdir/session" : "") . " -sess_out $tempdir/session"; +- open my $fh, "-|", "openssl s_client $cmd_opts -connect 127.0.0.1:$server->{tls_port} 2>&1 < /dev/null" ++ open my $fh, "-|", "openssl s_client -tls1_2 $cmd_opts -connect 127.0.0.1:$server->{tls_port} 2>&1 < /dev/null" + or die "failed to open pipe:$!"; + local $/; + <$fh>; +diff --git a/t/40ssl-cipher-suite.t b/t/40ssl-cipher-suite.t +index bda71842..71bdcf53 100644 +--- a/t/40ssl-cipher-suite.t ++++ b/t/40ssl-cipher-suite.t +@@ -32,7 +32,7 @@ my ($guard, $pid) = spawn_server( + ); + + # connect to the server with AES256-SHA as the first choice, and check that AES128-SHA was selected +-my $log = `openssl s_client -cipher AES256-SHA:AES128-SHA -host 127.0.0.1 -port $port < /dev/null 2>&1`; ++my $log = `openssl s_client -tls1_2 -cipher AES256-SHA:AES128-SHA -host 127.0.0.1 -port $port < /dev/null 2>&1`; + like $log, qr/^\s*Cipher\s*:\s*AES128-SHA\s*$/m; + + done_testing; +-- +2.18.0 + diff -Nru h2o-2.2.5+dfsg1/debian/rules h2o-2.2.5+dfsg2/debian/rules --- h2o-2.2.5+dfsg1/debian/rules 2018-06-03 15:26:38.000000000 +0000 +++ h2o-2.2.5+dfsg2/debian/rules 2018-10-01 19:37:17.000000000 +0000 @@ -5,7 +5,7 @@ export PERL5LIB=$(CURDIR) # Disable the following tests as they require network access -BAD_TESTS=10http1client 50reverse-proxy-added-headers 50reverse-proxy-drop-headers 50reverse-proxy-https 80invalid-h2-chars-in-headers 40server-push 50mruby-acl 80issues595 +BAD_TESTS=10http1client 50access-log 50reverse-proxy-added-headers 50reverse-proxy-drop-headers 50reverse-proxy-https 50reverse-proxy-session-resumption 80invalid-h2-chars-in-headers 40server-push 50mruby-acl 80issues595 %: dh $@ @@ -14,9 +14,11 @@ dh_auto_configure -- -DCMAKE_INSTALL_SYSCONFDIR=/etc/h2o -DWITH_BUNDLED_SSL=off -DWITH_MRUBY=on -DBUILD_SHARED_LIBS=on override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) for test in $(BAD_TESTS); do mv $(CURDIR)/t/$$test.t $(CURDIR)/t/$$test.disabled; done dh_auto_test for test in $(BAD_TESTS); do mv $(CURDIR)/t/$$test.disabled $(CURDIR)/t/$$test.t; done +endif override_dh_installinit: # Do not do a full restart, just a graceful reload diff -Nru h2o-2.2.5+dfsg1/debian/watch h2o-2.2.5+dfsg2/debian/watch --- h2o-2.2.5+dfsg1/debian/watch 2018-05-02 21:36:45.000000000 +0000 +++ h2o-2.2.5+dfsg2/debian/watch 2018-06-11 21:02:28.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -opts=repacksuffix=+dfsg1,dversionmangle=s/\+dfsg\d*// \ +opts=repacksuffix=+dfsg1,dversionmangle=s/\+dfsg\d*//,uversionmangle=s/-(alpha|beta|rc)/~$1/ \ https://github.com/h2o/h2o/releases .*/archive/v(.*)\.tar\.gz diff -Nru h2o-2.2.5+dfsg1/doc/benchmarks.html h2o-2.2.5+dfsg2/doc/benchmarks.html --- h2o-2.2.5+dfsg1/doc/benchmarks.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/benchmarks.html 2018-09-14 12:00:14.000000000 +0000 @@ -6,7 +6,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/access_control.html h2o-2.2.5+dfsg2/doc/configure/access_control.html --- h2o-2.2.5+dfsg1/doc/configure/access_control.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/access_control.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/access_log_directives.html h2o-2.2.5+dfsg2/doc/configure/access_log_directives.html --- h2o-2.2.5+dfsg1/doc/configure/access_log_directives.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/access_log_directives.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/base_directives.html h2o-2.2.5+dfsg2/doc/configure/base_directives.html --- h2o-2.2.5+dfsg1/doc/configure/base_directives.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/base_directives.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/basic_auth.html h2o-2.2.5+dfsg2/doc/configure/basic_auth.html --- h2o-2.2.5+dfsg1/doc/configure/basic_auth.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/basic_auth.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/cgi.html h2o-2.2.5+dfsg2/doc/configure/cgi.html --- h2o-2.2.5+dfsg1/doc/configure/cgi.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/cgi.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/command_options.html h2o-2.2.5+dfsg2/doc/configure/command_options.html --- h2o-2.2.5+dfsg1/doc/configure/command_options.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/command_options.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/compress_directives.html h2o-2.2.5+dfsg2/doc/configure/compress_directives.html --- h2o-2.2.5+dfsg1/doc/configure/compress_directives.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/compress_directives.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/dos_detection.html h2o-2.2.5+dfsg2/doc/configure/dos_detection.html --- h2o-2.2.5+dfsg1/doc/configure/dos_detection.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/dos_detection.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/errordoc_directives.html h2o-2.2.5+dfsg2/doc/configure/errordoc_directives.html --- h2o-2.2.5+dfsg1/doc/configure/errordoc_directives.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/errordoc_directives.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/expires_directives.html h2o-2.2.5+dfsg2/doc/configure/expires_directives.html --- h2o-2.2.5+dfsg1/doc/configure/expires_directives.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/expires_directives.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/fastcgi_directives.html h2o-2.2.5+dfsg2/doc/configure/fastcgi_directives.html --- h2o-2.2.5+dfsg1/doc/configure/fastcgi_directives.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/fastcgi_directives.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/file_directives.html h2o-2.2.5+dfsg2/doc/configure/file_directives.html --- h2o-2.2.5+dfsg1/doc/configure/file_directives.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/file_directives.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/headers_directives.html h2o-2.2.5+dfsg2/doc/configure/headers_directives.html --- h2o-2.2.5+dfsg1/doc/configure/headers_directives.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/headers_directives.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/http1_directives.html h2o-2.2.5+dfsg2/doc/configure/http1_directives.html --- h2o-2.2.5+dfsg1/doc/configure/http1_directives.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/http1_directives.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/http2_directives.html h2o-2.2.5+dfsg2/doc/configure/http2_directives.html --- h2o-2.2.5+dfsg1/doc/configure/http2_directives.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/http2_directives.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/mruby_directives.html h2o-2.2.5+dfsg2/doc/configure/mruby_directives.html --- h2o-2.2.5+dfsg1/doc/configure/mruby_directives.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/mruby_directives.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/mruby.html h2o-2.2.5+dfsg2/doc/configure/mruby.html --- h2o-2.2.5+dfsg1/doc/configure/mruby.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/mruby.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/proxy_directives.html h2o-2.2.5+dfsg2/doc/configure/proxy_directives.html --- h2o-2.2.5+dfsg1/doc/configure/proxy_directives.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/proxy_directives.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/quick_start.html h2o-2.2.5+dfsg2/doc/configure/quick_start.html --- h2o-2.2.5+dfsg1/doc/configure/quick_start.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/quick_start.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/redirect_directives.html h2o-2.2.5+dfsg2/doc/configure/redirect_directives.html --- h2o-2.2.5+dfsg1/doc/configure/redirect_directives.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/redirect_directives.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/reproxy_directives.html h2o-2.2.5+dfsg2/doc/configure/reproxy_directives.html --- h2o-2.2.5+dfsg1/doc/configure/reproxy_directives.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/reproxy_directives.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/status_directives.html h2o-2.2.5+dfsg2/doc/configure/status_directives.html --- h2o-2.2.5+dfsg1/doc/configure/status_directives.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/status_directives.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/syntax_and_structure.html h2o-2.2.5+dfsg2/doc/configure/syntax_and_structure.html --- h2o-2.2.5+dfsg1/doc/configure/syntax_and_structure.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/syntax_and_structure.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure/throttle_response_directives.html h2o-2.2.5+dfsg2/doc/configure/throttle_response_directives.html --- h2o-2.2.5+dfsg1/doc/configure/throttle_response_directives.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure/throttle_response_directives.html 2018-09-14 12:00:14.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/configure.html h2o-2.2.5+dfsg2/doc/configure.html --- h2o-2.2.5+dfsg1/doc/configure.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/configure.html 2018-09-14 12:00:14.000000000 +0000 @@ -6,7 +6,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/faq.html h2o-2.2.5+dfsg2/doc/faq.html --- h2o-2.2.5+dfsg1/doc/faq.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/faq.html 2018-09-14 12:00:14.000000000 +0000 @@ -6,7 +6,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/index.html h2o-2.2.5+dfsg2/doc/index.html --- h2o-2.2.5+dfsg1/doc/index.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/index.html 2018-09-14 12:00:14.000000000 +0000 @@ -6,7 +6,7 @@ - + diff -Nru h2o-2.2.5+dfsg1/doc/install.html h2o-2.2.5+dfsg2/doc/install.html --- h2o-2.2.5+dfsg1/doc/install.html 2018-05-31 13:57:10.000000000 +0000 +++ h2o-2.2.5+dfsg2/doc/install.html 2018-09-14 12:00:14.000000000 +0000 @@ -6,7 +6,7 @@ - +