diff -Nru python-tornado-4.5.3/debian/changelog python-tornado-4.5.3/debian/changelog --- python-tornado-4.5.3/debian/changelog 2018-01-15 13:02:11.000000000 +0000 +++ python-tornado-4.5.3/debian/changelog 2019-05-29 09:18:12.000000000 +0000 @@ -1,3 +1,12 @@ +python-tornado (4.5.3-1ubuntu0.1) bionic; urgency=medium + + * Cherrypick patches from python-tornado4 4.5.3-2 package, to + enable OpenSSL 1.1.1 support LP: #1797386: + - New_test_crt.patch regenerate stronger test certificates + - skip-failing-tests.patch skip some ssl tests failing with OpenSSL 1.1.1 + + -- Dimitri John Ledkov Wed, 29 May 2019 10:18:12 +0100 + python-tornado (4.5.3-1) unstable; urgency=medium * New upstream release diff -Nru python-tornado-4.5.3/debian/control python-tornado-4.5.3/debian/control --- python-tornado-4.5.3/debian/control 2018-01-15 11:58:32.000000000 +0000 +++ python-tornado-4.5.3/debian/control 2019-05-29 09:18:12.000000000 +0000 @@ -3,7 +3,8 @@ X-Python-Version: >= 2.7 X-Python3-Version: >= 3.3 Priority: optional -Maintainer: Debian Python Modules Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: Carl Chenet , Yaroslav Halchenko , Julian Taylor , diff -Nru python-tornado-4.5.3/debian/patches/New_test_crt.patch python-tornado-4.5.3/debian/patches/New_test_crt.patch --- python-tornado-4.5.3/debian/patches/New_test_crt.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-tornado-4.5.3/debian/patches/New_test_crt.patch 2019-05-29 09:17:25.000000000 +0000 @@ -0,0 +1,85 @@ +Author: Ondřej Nový +Description: Regenerate test crt +Forwarded: https://github.com/tornadoweb/tornado/pull/2509 + +--- a/tornado/test/test.crt ++++ b/tornado/test/test.crt +@@ -1,15 +1,20 @@ + -----BEGIN CERTIFICATE----- +-MIICSDCCAbGgAwIBAgIJAN1oTowzMbkzMA0GCSqGSIb3DQEBBQUAMD0xCzAJBgNV +-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRkwFwYDVQQKDBBUb3JuYWRvIFdl +-YiBUZXN0MB4XDTEwMDgyNTE4MjQ0NFoXDTIwMDgyMjE4MjQ0NFowPTELMAkGA1UE +-BhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExGTAXBgNVBAoMEFRvcm5hZG8gV2Vi +-IFRlc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALirW3mX4jbdFse2aZwW +-zszCJ1IsRDrzALpbvMYLLbIZqo+Z8v5aERKTRQpXFqGaZyY+tdwYy7X7YXcLtKqv +-jnw/MSeIaqkw5pROKz5aR0nkPLvcTmhJVLVPCLc8dFnIlu8aC9TrDhr90P+PzU39 +-UG7zLweA9zXKBuW3Tjo5dMP3AgMBAAGjUDBOMB0GA1UdDgQWBBRhJjMBYrzddCFr +-/0vvPyHMeqgo0TAfBgNVHSMEGDAWgBRhJjMBYrzddCFr/0vvPyHMeqgo0TAMBgNV +-HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAGP6GaxSfb21bikcqaK3ZKCC1sRJ +-tiCuvJZbBUFUCAzl05dYUfJZim/oWK+GqyUkUB8ciYivUNnn9OtS7DnlTgT2ws2e +-lNgn5cuFXoAGcHXzVlHG3yoywYBf3y0Dn20uzrlLXUWJAzoSLOt2LTaXvwlgm7hF +-W1q8SQ6UBshRw2X0 ++MIIDWzCCAkOgAwIBAgIUV4spou0CenmvKqa7Hml/MC+JKiAwDQYJKoZIhvcNAQEL ++BQAwPTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExGTAXBgNVBAoM ++EFRvcm5hZG8gV2ViIFRlc3QwHhcNMTgwOTI5MTM1NjQ1WhcNMjgwOTI2MTM1NjQ1 ++WjA9MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEZMBcGA1UECgwQ ++VG9ybmFkbyBXZWIgVGVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB ++AKT0LdyI8tW5uwP3ahE8BFSz+j3SsKBDv/0cKvqxVVE6sLEST2s3HjArZvIIG5sb ++iBkWDrqnZ6UKDvB4jlobLGAkepxDbrxHWxK53n0C28XXGLqJQ01TlTZ5rpjttMeg ++5SKNjHbxpOvpUwwQS4br4WjZKKyTGiXpFkFUty+tYVU35/U2yyvreWHmzpHx/25t ++H7O2RBARVwJYKOGPtlH62lQjpIWfVfklY4Ip8Hjl3B6rBxPyBULmVQw0qgoZn648 ++oa4oLjs0wnYBz01gVjNMDHej52SsB/ieH7W1TxFMzqOlcvHh41uFbQJPgcXsruSS ++9Z4twzSWkUp2vk/C//4Sz38CAwEAAaNTMFEwHQYDVR0OBBYEFLf8fQ5+u8sDWAd3 ++r5ZjZ5MmDWJeMB8GA1UdIwQYMBaAFLf8fQ5+u8sDWAd3r5ZjZ5MmDWJeMA8GA1Ud ++EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADkkm3pIb9IeqVNmQ2uhQOgw ++UwyToTYUHNTb/Nm5lzBTBqC8gbXAS24RQ30AB/7G115Uxeo+YMKfITxm/CgR+vhF ++F59/YrzwXj+G8bdbuVl/UbB6f9RSp+Zo93rUZAtPWr77gxLUrcwSRzzDwxFjC2nC ++6eigbkvt1OQY775RwnFAt7HKPclE0Out+cGJIboJuO1f3r57ZdyFH0GzbZEff/7K ++atGXohijWJjYvU4mk0KFHORZrcBpsv9cfkFbmgVmiRwxRJ1tLauHM3Ne+VfqYE5M ++4rTStSyz3ASqVKJ2iFMQueNR/tUOuDlfRt+0nhJMuYSSkW+KTgnwyOGU9cv+mxA= + -----END CERTIFICATE----- +--- a/tornado/test/test.key ++++ b/tornado/test/test.key +@@ -1,16 +1,28 @@ + -----BEGIN PRIVATE KEY----- +-MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBALirW3mX4jbdFse2 +-aZwWzszCJ1IsRDrzALpbvMYLLbIZqo+Z8v5aERKTRQpXFqGaZyY+tdwYy7X7YXcL +-tKqvjnw/MSeIaqkw5pROKz5aR0nkPLvcTmhJVLVPCLc8dFnIlu8aC9TrDhr90P+P +-zU39UG7zLweA9zXKBuW3Tjo5dMP3AgMBAAECgYEAiygNaWYrf95AcUQi9w00zpUr +-nj9fNvCwxr2kVbRMvd2balS/CC4EmXPCXdVcZ3B7dBVjYzSIJV0Fh/iZLtnVysD9 +-fcNMZ+Cz71b/T0ItsNYOsJk0qUVyP52uqsqkNppIPJsD19C+ZeMLZj6iEiylZyl8 +-2U16c/kVIjER63mUEGkCQQDayQOTGPJrKHqPAkUqzeJkfvHH2yCf+cySU+w6ezyr +-j9yxcq8aZoLusCebDVT+kz7RqnD5JePFvB38cMuepYBLAkEA2BTFdZx30f4moPNv +-JlXlPNJMUTUzsXG7n4vNc+18O5ous0NGQII8jZWrIcTrP8wiP9fF3JwUsKrJhcBn +-xRs3hQJBAIDUgz1YIE+HW3vgi1gkOh6RPdBAsVpiXtr/fggFz3j60qrO7FswaAMj +-SX8c/6KUlBYkNjgP3qruFf4zcUNvEzcCQQCaioCPFVE9ByBpjLG6IUTKsz2R9xL5 +-nfYqrbpLZ1aq6iLsYvkjugHE4X57sHLwNfdo4dHJbnf9wqhO2MVe25BhAkBdKYpY +-7OKc/2mmMbJDhVBgoixz/muN/5VjdfbvVY48naZkJF1p1tmogqPC5F1jPCS4rM+S +-FfPJIHRNEn2oktw5 ++MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCk9C3ciPLVubsD ++92oRPARUs/o90rCgQ7/9HCr6sVVROrCxEk9rNx4wK2byCBubG4gZFg66p2elCg7w ++eI5aGyxgJHqcQ268R1sSud59AtvF1xi6iUNNU5U2ea6Y7bTHoOUijYx28aTr6VMM ++EEuG6+Fo2Siskxol6RZBVLcvrWFVN+f1Nssr63lh5s6R8f9ubR+ztkQQEVcCWCjh ++j7ZR+tpUI6SFn1X5JWOCKfB45dweqwcT8gVC5lUMNKoKGZ+uPKGuKC47NMJ2Ac9N ++YFYzTAx3o+dkrAf4nh+1tU8RTM6jpXLx4eNbhW0CT4HF7K7kkvWeLcM0lpFKdr5P ++wv/+Es9/AgMBAAECggEABi6AaXtYXloPgB6NgwfUwbfc8OQsalUfpMShd7OdluW0 ++KW6eO05de0ClIvzay/1EJGyHMMeFQtIVrT1XWFkcWJ4FWkXMqJGkABenFtg8lDVz ++X8o1E3jGZrw4ptKBq9mDvL/BO9PiclTUH+ecbPn6AIvi0lTQ7grGIryiAM9mjmLy ++jpCwoutF2LD4RPNg8vqWe/Z1rQw5lp8FOHhRwPooHHeoq1bSrp8dqvVAwAam7Mmf ++uFgI8jrNycPgr2cwEEtbq2TQ625MhVnCpwT+kErmAStfbXXuqv1X1ZZgiNxf+61C ++OL0bhPRVIHmmjiK/5qHRuN4Q5u9/Yp2SJ4W5xadSQQKBgQDR7dnOlYYQiaoPJeD/ ++7jcLVJbWwbr7bE19O/QpYAtkA/FtGlKr+hQxPhK6OYp+in8eHf+ga/NSAjCWRBoh ++MNAVCJtiirHo2tFsLFOmlJpGL9n3sX8UnkJN90oHfWrzJ8BZnXaSw2eOuyw8LLj+ ++Q+ISl6Go8/xfsuy3EDv4AP1wCwKBgQDJJ4vEV3Kr+bc6N/xeu+G0oHvRAWwuQpcx ++9D+XpnqbJbFDnWKNE7oGsDCs8Qjr0CdFUN1pm1ppITDZ5N1cWuDg/47ZAXqEK6D1 ++z13S7O0oQPlnsPL7mHs2Vl73muAaBPAojFvceHHfccr7Z94BXqKsiyfaWz6kclT/ ++Nl4JTdsC3QKBgQCeYgozL2J/da2lUhnIXcyPstk+29kbueFYu/QBh2HwqnzqqLJ4 ++5+t2H3P3plQUFp/DdDSZrvhcBiTsKiNgqThEtkKtfSCvIvBf4a2W/4TJsW6MzxCm ++2KQDuK/UqM4Y+APKWN/N6Lln2VWNbNyBkWuuRVKFatccyJyJnSjxeqW7cwKBgGyN ++idCYPIrwROAHLItXKvOWE5t0ABRq3TsZC2RkdA/b5HCPs4pclexcEriRjvXrK/Yt ++MH94Ve8b+UftSUQ4ytjBMS6MrLg87y0YDhLwxv8NKUq65DXAUOW+8JsAmmWQOqY3 ++MK+m1BT4TMklgVoN3w3sPsKIsSJ/jLz5cv/kYweFAoGAG4iWU1378tI2Ts/Fngsv ++7eoWhoda77Y9D0Yoy20aN9VdMHzIYCBOubtRPEuwgaReNwbUBWap01J63yY/fF3K ++8PTz6covjoOJqxQJOvM7nM0CsJawG9ccw3YXyd9KgRIdSt6ooEhb7N8W2EXYoKl3 ++g1i2t41Q/SC3HUGC5mJjpO8= + -----END PRIVATE KEY----- diff -Nru python-tornado-4.5.3/debian/patches/series python-tornado-4.5.3/debian/patches/series --- python-tornado-4.5.3/debian/patches/series 2018-01-15 11:57:05.000000000 +0000 +++ python-tornado-4.5.3/debian/patches/series 2019-05-29 09:17:54.000000000 +0000 @@ -5,3 +5,5 @@ without-certifi.patch fix-ftbfs-on-hurd.patch 0007-Use-local-objects.inv-for-intersphinx-mapping.patch +New_test_crt.patch +skip-failing-tests.patch diff -Nru python-tornado-4.5.3/debian/patches/skip-failing-tests.patch python-tornado-4.5.3/debian/patches/skip-failing-tests.patch --- python-tornado-4.5.3/debian/patches/skip-failing-tests.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-tornado-4.5.3/debian/patches/skip-failing-tests.patch 2019-05-29 09:17:40.000000000 +0000 @@ -0,0 +1,52 @@ +From cfa930f77188ea156bfde396279a2e3d831feb05 Mon Sep 17 00:00:00 2001 +From: Benjamin Drung +Date: Tue, 18 Dec 2018 18:35:28 +0100 +Subject: [PATCH] Skip failing openssl 1.1.1 tests (for now) + +Four tests fail when using openssl 1.1.1 with TLS 1.3 support. Disable +these tests for now. Please fix the bug and re-enable them again. + +Bug: https://github.com/tornadoweb/tornado/issues/2536 +--- + tornado/test/iostream_test.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tornado/test/iostream_test.py b/tornado/test/iostream_test.py +index 3f2c1228..ebd4fe67 100644 +--- a/tornado/test/iostream_test.py ++++ b/tornado/test/iostream_test.py +@@ -212,6 +212,7 @@ class TestIOStreamMixin(object): + server.close() + client.close() + ++ @unittest.skip("Failing when using openssl 1.1.1 with TLS 1.3 support. See https://github.com/tornadoweb/tornado/issues/2536") + def test_write_zero_bytes(self): + # Attempting to write zero bytes should run the callback without + # going into an infinite loop. +@@ -437,6 +438,7 @@ class TestIOStreamMixin(object): + server.close() + client.close() + ++ @unittest.skip("Failing when using openssl 1.1.1 with TLS 1.3 support. See https://github.com/tornadoweb/tornado/issues/2536") + def test_read_until_close_after_close(self): + # Similar to test_delayed_close_callback, but read_until_close takes + # a separate code path so test it separately. +@@ -469,6 +471,7 @@ class TestIOStreamMixin(object): + server.close() + client.close() + ++ @unittest.skip("Failing when using openssl 1.1.1 with TLS 1.3 support. See https://github.com/tornadoweb/tornado/issues/2536") + def test_streaming_read_until_close_after_close(self): + # Same as the preceding test but with a streaming_callback. + # All data should go through the streaming callback, +@@ -540,6 +543,7 @@ class TestIOStreamMixin(object): + + @skipIfNonUnix + @skipPypy3V58 ++ @unittest.skip("Failing when using openssl 1.1.1 with TLS 1.3 support. See https://github.com/tornadoweb/tornado/issues/2536") + def test_inline_read_error(self): + # An error on an inline read is raised without logging (on the + # assumption that it will eventually be noticed or logged further +-- +2.17.1 +