#36 f29: Fix FTBFS
Closed 2 years ago by jaruga. Opened 2 years ago by jaruga.
Unknown source hotfix/f29-fix-ftbfs  into  master

file modified
+1
@@ -119,6 +119,7 @@

      def default_path

        path = default_dirs.collect {|location, paths| paths[:gem_dir]}

        path.unshift Gem.user_dir if File.exist? Gem.user_home

+       path

      end

  

      def default_ext_dir_for base_dir

@@ -11,7 +11,7 @@

  index 682eb46..e6b1445 100644

  --- a/lib/mkmf.rb

  +++ b/lib/mkmf.rb

- @@ -1899,7 +1899,7 @@ def configuration(srcdir)

+ @@ -1900,7 +1900,7 @@ def configuration(srcdir)

   SHELL = /bin/sh

   

   # V=0 quiet, V=1 verbose.  other values don't work.

@@ -1,112 +0,0 @@

- From 71057ca5963108bac1e2c31bd0e8e205ba74cc19 Mon Sep 17 00:00:00 2001

- From: Kazuki Yamaguchi <k@rhe.jp>

- Date: Fri, 11 May 2018 13:43:32 +0900

- Subject: [PATCH 1/2] test/test_pkey_rsa: fix test failure with OpenSSL 1.1.1

- 

- OpenSSL 1.1.1 raised the minimum size for RSA keys to 512 bits.

- ---

-  test/openssl/test_pkey_rsa.rb | 9 ++++++++-

-  1 file changed, 8 insertions(+), 1 deletion(-)

- 

- diff --git a/test/openssl/test_pkey_rsa.rb b/test/openssl/test_pkey_rsa.rb

- index c1205563..b4393e68 100644

- --- a/test/openssl/test_pkey_rsa.rb

- +++ b/test/openssl/test_pkey_rsa.rb

- @@ -60,6 +60,13 @@ def test_new_with_exponent

-      end

-    end

-  

- +  def test_generate

- +    key = OpenSSL::PKey::RSA.generate(512, 17)

- +    assert_equal 512, key.n.num_bits

- +    assert_equal 17, key.e

- +    assert_not_nil key.d

- +  end

- +

-    def test_new_break

-      assert_nil(OpenSSL::PKey::RSA.new(1024) { break })

-      assert_raise(RuntimeError) do

- @@ -256,7 +263,7 @@ def test_pem_passwd

-    end

-  

-    def test_dup

- -    key = OpenSSL::PKey::RSA.generate(256, 17)

- +    key = Fixtures.pkey("rsa1024")

-      key2 = key.dup

-      assert_equal key.params, key2.params

-      key2.set_key(key2.n, 3, key2.d)

- 

- From a5e26bc1345fe325bdc619f9b1768b7ad3c94214 Mon Sep 17 00:00:00 2001

- From: Kazuki Yamaguchi <k@rhe.jp>

- Date: Fri, 11 May 2018 14:12:39 +0900

- Subject: [PATCH 2/2] test/test_ssl_session: set client protocol version

-  explicitly

- 

- Clients that implement TLS 1.3's Middlebox Compatibility Mode will

- always provide a non-empty session ID in the ClientHello. This means

- the "get" callback for the server-side session caching may be called

- for the initial connection.

- ---

-  test/openssl/test_ssl_session.rb | 14 +++++++++-----

-  1 file changed, 9 insertions(+), 5 deletions(-)

- 

- diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb

- index af8c65b1..6db0c2d1 100644

- --- a/test/openssl/test_ssl_session.rb

- +++ b/test/openssl/test_ssl_session.rb

- @@ -198,7 +198,9 @@ def test_server_session_cache

-        first_session = nil

-        10.times do |i|

-          connections = i

- -        server_connect_with_session(port, nil, first_session) { |ssl|

- +        cctx = OpenSSL::SSL::SSLContext.new

- +        cctx.ssl_version = :TLSv1_2

- +        server_connect_with_session(port, cctx, first_session) { |ssl|

-            ssl.puts("abc"); assert_equal "abc\n", ssl.gets

-            first_session ||= ssl.session

-  

- @@ -257,6 +259,8 @@ def test_ctx_server_session_cb

-  

-      connections = nil

-      called = {}

- +    cctx = OpenSSL::SSL::SSLContext.new

- +    cctx.ssl_version = :TLSv1_2

-      sctx = nil

-      ctx_proc = Proc.new { |ctx|

-        sctx = ctx

- @@ -292,7 +296,7 @@ def test_ctx_server_session_cb

-      }

-      start_server(ctx_proc: ctx_proc) do |port|

-        connections = 0

- -      sess0 = server_connect_with_session(port, nil, nil) { |ssl|

- +      sess0 = server_connect_with_session(port, cctx, nil) { |ssl|

-          ssl.puts("abc"); assert_equal "abc\n", ssl.gets

-          assert_equal false, ssl.session_reused?

-          ssl.session

- @@ -307,7 +311,7 @@ def test_ctx_server_session_cb

-  

-        # Internal cache hit

-        connections = 1

- -      server_connect_with_session(port, nil, sess0.dup) { |ssl|

- +      server_connect_with_session(port, cctx, sess0.dup) { |ssl|

-          ssl.puts("abc"); assert_equal "abc\n", ssl.gets

-          assert_equal true, ssl.session_reused?

-          ssl.session

- @@ -328,7 +332,7 @@ def test_ctx_server_session_cb

-  

-        # External cache hit

-        connections = 2

- -      sess2 = server_connect_with_session(port, nil, sess0.dup) { |ssl|

- +      sess2 = server_connect_with_session(port, cctx, sess0.dup) { |ssl|

-          ssl.puts("abc"); assert_equal "abc\n", ssl.gets

-          if !ssl.session_reused? && openssl?(1, 1, 0) && !openssl?(1, 1, 0, 7)

-            # OpenSSL >= 1.1.0, < 1.1.0g

- @@ -355,7 +359,7 @@ def test_ctx_server_session_cb

-  

-        # Cache miss

-        connections = 3

- -      sess3 = server_connect_with_session(port, nil, sess0.dup) { |ssl|

- +      sess3 = server_connect_with_session(port, cctx, sess0.dup) { |ssl|

-          ssl.puts("abc"); assert_equal "abc\n", ssl.gets

-          assert_equal false, ssl.session_reused?

-          ssl.session

@@ -1,115 +0,0 @@

- From 584b5929f9b769c4d0b03e322a9fddf2b2dd3454 Mon Sep 17 00:00:00 2001

- From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>

- Date: Sun, 1 Apr 2018 13:02:11 +0000

- Subject: [PATCH] test_time_tz.rb: Kiritimati tzdata fix

- 

- * test/ruby/test_time_tz.rb (gen_zdump_test): fix the expected

-   data at the Kiritimati's skip of New Year's Eve 1994.

-   [Bug #14655]

- 

- git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63055 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

- ---

-  test/ruby/test_time_tz.rb | 9 +++++++++

-  1 file changed, 9 insertions(+)

- 

- diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb

- index dfe139033ed3..ac5f81892878 100644

- --- a/test/ruby/test_time_tz.rb

- +++ b/test/ruby/test_time_tz.rb

- @@ -364,9 +364,18 @@ def self.gen_zdump_test(data)

-  Europe/London  Sun Aug 10 01:00:00 1947 UTC = Sun Aug 10 02:00:00 1947 BST isdst=1 gmtoff=3600

-  Europe/London  Sun Nov  2 01:59:59 1947 UTC = Sun Nov  2 02:59:59 1947 BST isdst=1 gmtoff=3600

-  Europe/London  Sun Nov  2 02:00:00 1947 UTC = Sun Nov  2 02:00:00 1947 GMT isdst=0 gmtoff=0

- +End

- +  if CORRECT_KIRITIMATI_SKIP_1994

- +    gen_zdump_test <<'End'

- +Pacific/Kiritimati  Sat Dec 31 09:59:59 1994 UTC = Fri Dec 30 23:59:59 1994 LINT isdst=0 gmtoff=-36000

- +Pacific/Kiritimati  Sat Dec 31 10:00:00 1994 UTC = Sun Jan  1 00:00:00 1995 LINT isdst=0 gmtoff=50400

- +End

- +  else

- +    gen_zdump_test <<'End'

-  Pacific/Kiritimati  Sun Jan  1 09:59:59 1995 UTC = Sat Dec 31 23:59:59 1994 LINT isdst=0 gmtoff=-36000

-  Pacific/Kiritimati  Sun Jan  1 10:00:00 1995 UTC = Mon Jan  2 00:00:00 1995 LINT isdst=0 gmtoff=50400

-  End

- +  end

-    gen_zdump_test <<'End' if has_right_tz

-  right/America/Los_Angeles  Fri Jun 30 23:59:60 1972 UTC = Fri Jun 30 16:59:60 1972 PDT isdst=1 gmtoff=-25200

-  right/America/Los_Angeles  Wed Dec 31 23:59:60 2008 UTC = Wed Dec 31 15:59:60 2008 PST isdst=0 gmtoff=-28800

- --

- 

- From 2965c2d4df78e6f5acf8759f84c88ce14a4e70f1 Mon Sep 17 00:00:00 2001

- From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>

- Date: Sun, 1 Apr 2018 02:00:36 +0000

- Subject: [PATCH] test_time_tz.rb: Kiritimati tzdata fix

- 

- * test/ruby/test_time_tz.rb (TestTimeTZ#test_pacific_kiritimati):

-   fix the expected data at the skip of New Year's Eve 1994.

-   [Bug #14655]

- 

- git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

- ---

-  test/ruby/test_time_tz.rb | 17 ++++++++++++++---

-  1 file changed, 14 insertions(+), 3 deletions(-)

- 

- diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb

- index 39b830d28a3d..dfe139033ed3 100644

- --- a/test/ruby/test_time_tz.rb

- +++ b/test/ruby/test_time_tz.rb

- @@ -89,6 +89,9 @@ def group_by(e, &block)

-        Time.local(1951, 5, 6, 1, 0, 0).dst?   # DST with fixed tzdata

-      end

-    }

- +  CORRECT_KIRITIMATI_SKIP_1994 = with_tz("Pacific/Kiritimati") {

- +    Time.local(1994, 12, 31, 0, 0, 0).year == 1995

- +  }

-  

-    def time_to_s(t)

-      t.to_s

- @@ -178,9 +181,17 @@ def test_europe_lisbon

-  

-    def test_pacific_kiritimati

-      with_tz(tz="Pacific/Kiritimati") {

- -      assert_time_constructor(tz, "1994-12-31 23:59:59 -1000", :local, [1994,12,31,23,59,59])

- -      assert_time_constructor(tz, "1995-01-02 00:00:00 +1400", :local, [1995,1,1,0,0,0])

- -      assert_time_constructor(tz, "1995-01-02 23:59:59 +1400", :local, [1995,1,1,23,59,59])

- +      assert_time_constructor(tz, "1994-12-30 00:00:00 -1000", :local, [1994,12,30,0,0,0])

- +      assert_time_constructor(tz, "1994-12-30 23:59:59 -1000", :local, [1994,12,30,23,59,59])

- +      if CORRECT_KIRITIMATI_SKIP_1994

- +        assert_time_constructor(tz, "1995-01-01 00:00:00 +1400", :local, [1994,12,31,0,0,0])

- +        assert_time_constructor(tz, "1995-01-01 23:59:59 +1400", :local, [1994,12,31,23,59,59])

- +        assert_time_constructor(tz, "1995-01-01 00:00:00 +1400", :local, [1995,1,1,0,0,0])

- +      else

- +        assert_time_constructor(tz, "1994-12-31 23:59:59 -1000", :local, [1994,12,31,23,59,59])

- +        assert_time_constructor(tz, "1995-01-02 00:00:00 +1400", :local, [1995,1,1,0,0,0])

- +        assert_time_constructor(tz, "1995-01-02 23:59:59 +1400", :local, [1995,1,1,23,59,59])

- +      end

-        assert_time_constructor(tz, "1995-01-02 00:00:00 +1400", :local, [1995,1,2,0,0,0])

-      }

-    end

- --

- 

- From a0e6607a8172f9eaf9a15f03065736deb2035771 Mon Sep 17 00:00:00 2001

- From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>

- Date: Sun, 1 Apr 2018 13:16:14 +0000

- Subject: [PATCH] test_time_tz.rb: Lisbon tzdata fix

- 

- * test/ruby/test_time_tz.rb (gen_variational_zdump_test): Update

-   Lisbon zdump data, which fixed the 1912-01-01 transition for

-   Portugual and its colonies.  [Bug #14655]

- 

- git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63056 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

- ---

-  test/ruby/test_time_tz.rb | 1 +

-  1 file changed, 1 insertion(+)

- 

- diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb

- index ac5f81892878..b32caff9c539 100644

- --- a/test/ruby/test_time_tz.rb

- +++ b/test/ruby/test_time_tz.rb

- @@ -434,5 +434,6 @@ def self.gen_variational_zdump_test(hint, data)

-    gen_variational_zdump_test "lisbon", <<'End' if has_lisbon_tz

-  Europe/Lisbon  Mon Jan  1 00:36:31 1912 UTC = Sun Dec 31 23:59:59 1911 LMT isdst=0 gmtoff=-2192

-  Europe/Lisbon  Mon Jan  1 00:36:44 1912 UT = Sun Dec 31 23:59:59 1911 LMT isdst=0 gmtoff=-2205

- +Europe/Lisbon  Sun Dec 31 23:59:59 1911 UT = Sun Dec 31 23:23:14 1911 LMT isdst=0 gmtoff=-2205

-  End

-  end

@@ -0,0 +1,502 @@

+ From f234e6c3d3170f37508e214cdaef78d4b2584e5a Mon Sep 17 00:00:00 2001

+ From: kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>

+ Date: Wed, 2 Jan 2019 03:08:20 +0000

+ Subject: [PATCH 1/2] Try to update cert

+ 

+ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66685 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

+ ---

+  test/net/fixtures/cacert.pem |  86 +++++++-------------------

+  test/net/fixtures/server.crt | 113 +++++++++++++++++++++++------------

+  test/net/fixtures/server.key |  43 ++++++++-----

+  3 files changed, 124 insertions(+), 118 deletions(-)

+ 

+ diff --git a/test/net/fixtures/cacert.pem b/test/net/fixtures/cacert.pem

+ index 7073387877..f623bd62ed 100644

+ --- a/test/net/fixtures/cacert.pem

+ +++ b/test/net/fixtures/cacert.pem

+ @@ -1,66 +1,24 @@

+ -Certificate:

+ -    Data:

+ -        Version: 3 (0x2)

+ -        Serial Number:

+ -            b9:90:a2:bf:62:69:17:9c

+ -        Signature Algorithm: sha1WithRSAEncryption

+ -        Issuer: C=JP, ST=Shimane, L=Matz-e city, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org

+ -        Validity

+ -            Not Before: Jan  3 01:34:17 2014 GMT

+ -            Not After : Jan  2 01:34:17 2019 GMT

+ -        Subject: C=JP, ST=Shimane, L=Matz-e city, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org

+ -        Subject Public Key Info:

+ -            Public Key Algorithm: rsaEncryption

+ -            RSA Public Key: (1024 bit)

+ -                Modulus (1024 bit):

+ -                    00:db:75:d0:45:de:b1:df:bf:71:a0:0e:b0:a5:e6:

+ -                    bc:f4:1c:9d:e5:25:67:64:c5:7b:cb:f1:af:c6:be:

+ -                    9a:aa:ea:7e:0f:cc:05:af:ef:40:69:06:b2:c9:13:

+ -                    9d:7e:eb:a2:06:e2:ea:7d:07:c7:c7:99:c7:fb:d5:

+ -                    b8:eb:63:77:62:2b:18:12:c3:53:58:d0:f5:c7:40:

+ -                    0c:01:d1:26:82:34:16:09:e3:dc:65:f4:dc:bb:5d:

+ -                    a5:41:60:e7:a9:74:ba:d7:4c:b6:a3:9c:c5:8c:89:

+ -                    af:cb:e8:9f:05:fe:ea:fe:64:24:bf:e7:ed:e3:f6:

+ -                    d0:fc:d6:eb:fc:06:82:10:fb

+ -                Exponent: 65537 (0x10001)

+ -        X509v3 extensions:

+ -            X509v3 Subject Key Identifier: 

+ -                E8:7E:58:AC:13:7B:03:22:8D:9E:AF:32:0B:84:89:80:80:0C:1E:C2

+ -            X509v3 Authority Key Identifier: 

+ -                keyid:E8:7E:58:AC:13:7B:03:22:8D:9E:AF:32:0B:84:89:80:80:0C:1E:C2

+ -                DirName:/C=JP/ST=Shimane/L=Matz-e city/O=Ruby Core Team/CN=Ruby Test CA/emailAddress=security@ruby-lang.org

+ -                serial:B9:90:A2:BF:62:69:17:9C

+ -

+ -            X509v3 Basic Constraints: 

+ -                CA:TRUE

+ -    Signature Algorithm: sha1WithRSAEncryption

+ -        8f:77:06:4e:31:72:12:ee:68:09:70:27:d4:31:85:ef:10:95:

+ -        f9:0f:2b:66:63:08:37:88:6e:b7:9b:40:3e:18:77:33:86:e8:

+ -        61:6a:b7:3c:cb:c7:a6:d6:d5:92:6a:1f:56:d0:9f:5c:32:56:

+ -        d3:37:52:fe:0e:20:c2:7a:0d:fe:2d:3c:81:da:b8:7f:4d:6a:

+ -        08:01:d9:be:7a:a2:15:be:a6:ce:49:64:90:8c:9a:ca:6e:2e:

+ -        84:48:1d:94:19:56:94:46:aa:25:9b:68:c2:80:60:bf:cb:2e:

+ -        35:03:ea:0a:65:5a:33:38:c6:cc:81:46:c0:bc:36:86:96:39:

+ -        10:7d

+  -----BEGIN CERTIFICATE-----

+ -MIIDjTCCAvagAwIBAgIJALmQor9iaRecMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD

+ -VQQGEwJKUDEQMA4GA1UECBMHU2hpbWFuZTEUMBIGA1UEBxMLTWF0ei1lIGNpdHkx

+ -FzAVBgNVBAoTDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDEwxSdWJ5IFRlc3QgQ0Ex

+ -JTAjBgkqhkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwHhcNMTQwMTAz

+ -MDEzNDE3WhcNMTkwMTAyMDEzNDE3WjCBjDELMAkGA1UEBhMCSlAxEDAOBgNVBAgT

+ -B1NoaW1hbmUxFDASBgNVBAcTC01hdHotZSBjaXR5MRcwFQYDVQQKEw5SdWJ5IENv

+ -cmUgVGVhbTEVMBMGA1UEAxMMUnVieSBUZXN0IENBMSUwIwYJKoZIhvcNAQkBFhZz

+ -ZWN1cml0eUBydWJ5LWxhbmcub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB

+ -gQDbddBF3rHfv3GgDrCl5rz0HJ3lJWdkxXvL8a/Gvpqq6n4PzAWv70BpBrLJE51+

+ -66IG4up9B8fHmcf71bjrY3diKxgSw1NY0PXHQAwB0SaCNBYJ49xl9Ny7XaVBYOep

+ -dLrXTLajnMWMia/L6J8F/ur+ZCS/5+3j9tD81uv8BoIQ+wIDAQABo4H0MIHxMB0G

+ -A1UdDgQWBBToflisE3sDIo2erzILhImAgAwewjCBwQYDVR0jBIG5MIG2gBToflis

+ -E3sDIo2erzILhImAgAwewqGBkqSBjzCBjDELMAkGA1UEBhMCSlAxEDAOBgNVBAgT

+ -B1NoaW1hbmUxFDASBgNVBAcTC01hdHotZSBjaXR5MRcwFQYDVQQKEw5SdWJ5IENv

+ -cmUgVGVhbTEVMBMGA1UEAxMMUnVieSBUZXN0IENBMSUwIwYJKoZIhvcNAQkBFhZz

+ -ZWN1cml0eUBydWJ5LWxhbmcub3JnggkAuZCiv2JpF5wwDAYDVR0TBAUwAwEB/zAN

+ -BgkqhkiG9w0BAQUFAAOBgQCPdwZOMXIS7mgJcCfUMYXvEJX5DytmYwg3iG63m0A+

+ -GHczhuhharc8y8em1tWSah9W0J9cMlbTN1L+DiDCeg3+LTyB2rh/TWoIAdm+eqIV

+ -vqbOSWSQjJrKbi6ESB2UGVaURqolm2jCgGC/yy41A+oKZVozOMbMgUbAvDaGljkQ

+ -fQ==

+ +MIID7TCCAtWgAwIBAgIJAIltvxrFAuSnMA0GCSqGSIb3DQEBCwUAMIGMMQswCQYD

+ +VQQGEwJKUDEQMA4GA1UECAwHU2hpbWFuZTEUMBIGA1UEBwwLTWF0ei1lIGNpdHkx

+ +FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDDAxSdWJ5IFRlc3QgQ0Ex

+ +JTAjBgkqhkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwHhcNMTkwMTAy

+ +MDI1ODI4WhcNMjQwMTAxMDI1ODI4WjCBjDELMAkGA1UEBhMCSlAxEDAOBgNVBAgM

+ +B1NoaW1hbmUxFDASBgNVBAcMC01hdHotZSBjaXR5MRcwFQYDVQQKDA5SdWJ5IENv

+ +cmUgVGVhbTEVMBMGA1UEAwwMUnVieSBUZXN0IENBMSUwIwYJKoZIhvcNAQkBFhZz

+ +ZWN1cml0eUBydWJ5LWxhbmcub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB

+ +CgKCAQEAznlbjRVhz1NlutHVrhcGnK8W0qug2ujKXv1njSC4U6nJF6py7I9EeehV

+ +SaKePyv+I9z3K1LnfUHOtUbdwdKC77yN66A6q2aqzu5q09/NSykcZGOIF0GuItYI

+ +3nvW3IqBddff2ffsyR+9pBjfb5AIPP08WowF9q4s1eGULwZc4w2B8PFhtxYANd7d

+ +BvGLXFlcufv9tDtzyRi4t7eqxCRJkZQIZNZ6DHHIJrNxejOILfHLarI12yk8VK6L

+ +2LG4WgGqyeePiRyd1o1MbuiAFYqAwpXNUbRKg5NaZGwBHZk8UZ+uFKt1QMBURO5R

+ +WFy1c349jbWszTqFyL4Lnbg9HhAowQIDAQABo1AwTjAdBgNVHQ4EFgQU9tEiKdU9

+ +I9derQyc5nWPnc34nVMwHwYDVR0jBBgwFoAU9tEiKdU9I9derQyc5nWPnc34nVMw

+ +DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAxj7F/u3C3fgq24N7hGRA

+ +of7ClFQxGmo/IGT0AISzW3HiVYiFaikKhbO1NwD9aBpD8Zwe62sCqMh8jGV/b0+q

+ +aOORnWYNy2R6r9FkASAglmdF6xn3bhgGD5ls4pCvcG9FynGnGc24g6MrjFNrBYUS

+ +2iIZsg36i0IJswo/Dy6HLphCms2BMCD3DeWtfjePUiTmQHJo6HsQIKP/u4N4Fvee

+ +uMBInei2M4VU74fLXbmKl1F9AEX7JDP3BKSZG19Ch5pnUo4uXM1uNTGsi07P4Y0s

+ +K44+SKBC0bYEFbDK0eQWMrX3kIhkPxyIWhxdq9/NqPYjShuSEAhA6CSpmRg0pqc+

+ +mA==

+  -----END CERTIFICATE-----

+ diff --git a/test/net/fixtures/server.crt b/test/net/fixtures/server.crt

+ index fa4f99493a..817ecc222c 100644

+ --- a/test/net/fixtures/server.crt

+ +++ b/test/net/fixtures/server.crt

+ @@ -1,48 +1,83 @@

+  Certificate:

+      Data:

+ -        Version: 1 (0x0)

+ -        Serial Number: 0 (0x0)

+ -        Signature Algorithm: sha1WithRSAEncryption

+ +        Version: 3 (0x2)

+ +        Serial Number: 1 (0x1)

+ +    Signature Algorithm: sha256WithRSAEncryption

+          Issuer: C=JP, ST=Shimane, L=Matz-e city, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org

+          Validity

+ -            Not Before: Jan  3 01:34:17 2014 GMT

+ -            Not After : Jan  2 01:34:17 2019 GMT

+ -        Subject: C=JP, ST=Shimane, O=Ruby Core Team, OU=Ruby Test, CN=localhost

+ +            Not Before: Jan  2 03:06:53 2019 GMT

+ +            Not After : Jan  1 03:06:53 2024 GMT

+ +        Subject: C=JP, ST=Shimane, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org

+          Subject Public Key Info:

+              Public Key Algorithm: rsaEncryption

+ -            RSA Public Key: (1024 bit)

+ -                Modulus (1024 bit):

+ -                    00:db:75:d0:45:de:b1:df:bf:71:a0:0e:b0:a5:e6:

+ -                    bc:f4:1c:9d:e5:25:67:64:c5:7b:cb:f1:af:c6:be:

+ -                    9a:aa:ea:7e:0f:cc:05:af:ef:40:69:06:b2:c9:13:

+ -                    9d:7e:eb:a2:06:e2:ea:7d:07:c7:c7:99:c7:fb:d5:

+ -                    b8:eb:63:77:62:2b:18:12:c3:53:58:d0:f5:c7:40:

+ -                    0c:01:d1:26:82:34:16:09:e3:dc:65:f4:dc:bb:5d:

+ -                    a5:41:60:e7:a9:74:ba:d7:4c:b6:a3:9c:c5:8c:89:

+ -                    af:cb:e8:9f:05:fe:ea:fe:64:24:bf:e7:ed:e3:f6:

+ -                    d0:fc:d6:eb:fc:06:82:10:fb

+ +                Public-Key: (2048 bit)

+ +                Modulus:

+ +                    00:c1:a9:64:ef:d3:f2:e1:1a:7f:24:df:7f:65:86:

+ +                    c1:98:55:16:83:91:16:5b:63:6e:26:bb:c0:73:68:

+ +                    7b:f7:00:ba:37:db:7f:a9:5c:c8:98:aa:43:96:87:

+ +                    e1:a0:63:69:0c:d8:22:90:f5:56:22:b1:57:6e:71:

+ +                    3b:30:04:d0:64:4d:38:33:a0:ea:c1:16:3d:16:be:

+ +                    c0:49:4c:f0:14:15:af:09:95:da:bf:c7:23:34:c3:

+ +                    7d:af:b7:70:b3:6d:1b:de:21:93:c0:7c:6c:0e:fd:

+ +                    0e:e5:ff:f3:80:51:0c:df:80:7c:40:46:c9:ca:57:

+ +                    d4:88:02:0f:f0:1e:14:18:f1:98:0f:c6:42:1d:cc:

+ +                    90:29:71:1b:af:4a:22:e0:e7:86:fc:dd:d3:d8:84:

+ +                    0e:5e:f0:9b:93:5f:0a:9a:1d:f8:f5:f3:e7:c7:b0:

+ +                    7a:0e:25:20:13:02:1a:22:c2:d9:e0:7f:4f:a1:7f:

+ +                    72:f6:e6:e1:14:7c:c5:93:7f:a6:96:3b:ab:d8:f1:

+ +                    dc:2b:01:d6:e5:fe:5c:cf:08:db:06:e9:fd:7d:bd:

+ +                    fe:2c:f4:8a:7b:9f:15:88:05:2e:f7:ba:c9:86:7e:

+ +                    14:50:f4:96:a1:84:17:5d:f7:8b:0a:7a:14:2c:de:

+ +                    ca:00:74:f8:23:32:9d:66:af:1c:a6:58:1a:de:82:

+ +                    96:a9

+                  Exponent: 65537 (0x10001)

+ -    Signature Algorithm: sha1WithRSAEncryption

+ -        85:f5:d3:05:8b:8c:f4:43:1c:88:f2:8f:b2:f2:93:77:b7:3d:

+ -        95:c6:a0:34:bc:33:6a:d8:85:5f:3e:86:08:10:c5:5c:c1:76:

+ -        a3:53:3c:dc:38:98:23:97:e7:da:21:ac:e8:4d:3c:96:70:29:

+ -        ff:ff:1e:4a:9a:17:2b:db:04:62:b9:ef:ab:ea:a7:a5:e8:7c:

+ -        b1:d5:ed:30:a8:6c:78:de:51:7e:e3:8a:c2:a4:64:a8:63:a2:

+ -        bc:fd:43:9c:f3:55:7d:54:c9:6a:d8:53:1c:4b:6b:03:aa:b6:

+ -        19:e6:a4:4f:47:00:96:c5:42:59:85:4e:c3:4e:cd:41:82:53:

+ -        10:f8

+ +        X509v3 extensions:

+ +            X509v3 Basic Constraints: 

+ +                CA:FALSE

+ +            Netscape Comment: 

+ +                OpenSSL Generated Certificate

+ +            X509v3 Subject Key Identifier: 

+ +                F2:C9:35:05:31:EF:08:EE:EF:B0:FE:1A:72:C2:9E:70:E3:E3:EC:43

+ +            X509v3 Authority Key Identifier: 

+ +                keyid:F6:D1:22:29:D5:3D:23:D7:5E:AD:0C:9C:E6:75:8F:9D:CD:F8:9D:53

+ +

+ +    Signature Algorithm: sha256WithRSAEncryption

+ +         02:e7:0a:22:7c:5e:d9:92:d2:b9:fb:4a:bf:75:3f:00:e6:19:

+ +         3e:90:a5:9d:38:41:82:4c:6f:b9:f3:f2:58:a1:91:7f:4a:d4:

+ +         28:38:9c:7c:4d:6c:2f:2f:95:f5:55:55:25:a1:71:0c:05:42:

+ +         08:a3:a6:ab:e3:04:47:9a:42:24:8f:b2:ba:50:55:af:b8:d7:

+ +         fc:1a:13:92:5d:75:7d:e1:4d:87:5e:57:82:c5:5f:d6:b8:ea:

+ +         86:4e:05:b0:7f:07:27:a5:36:1f:1e:54:f1:32:35:7f:9c:75:

+ +         26:6a:21:75:37:32:bb:89:01:78:97:cc:d3:de:3a:e8:ce:45:

+ +         ed:12:24:2e:a8:25:73:b3:cd:70:47:b8:81:f9:06:aa:8d:87:

+ +         2f:a9:cd:fe:79:40:cc:c9:47:3d:2f:82:c2:82:bf:5d:8a:06:

+ +         5b:a9:90:d3:b0:a7:fc:f3:1a:fb:0e:cb:8f:d8:f2:4e:f4:8d:

+ +         bb:4b:d5:2d:20:c0:6e:d5:08:2b:81:32:c4:e0:d2:4b:31:27:

+ +         f1:55:96:0e:d4:b9:92:02:71:98:69:e5:73:cc:52:45:a0:07:

+ +         fb:28:9e:b0:fc:b1:58:42:5a:08:4a:30:49:e5:f1:a5:c8:d5:

+ +         8a:67:f0:ed:9e:3f:1b:71:a6:80:91:81:cb:1a:3d:b5:8e:87:

+ +         9d:64:28:ce

+  -----BEGIN CERTIFICATE-----

+ -MIICXDCCAcUCAQAwDQYJKoZIhvcNAQEFBQAwgYwxCzAJBgNVBAYTAkpQMRAwDgYD

+ -VQQIEwdTaGltYW5lMRQwEgYDVQQHEwtNYXR6LWUgY2l0eTEXMBUGA1UEChMOUnVi

+ -eSBDb3JlIFRlYW0xFTATBgNVBAMTDFJ1YnkgVGVzdCBDQTElMCMGCSqGSIb3DQEJ

+ -ARYWc2VjdXJpdHlAcnVieS1sYW5nLm9yZzAeFw0xNDAxMDMwMTM0MTdaFw0xOTAx

+ -MDIwMTM0MTdaMGAxCzAJBgNVBAYTAkpQMRAwDgYDVQQIEwdTaGltYW5lMRcwFQYD

+ -VQQKEw5SdWJ5IENvcmUgVGVhbTESMBAGA1UECxMJUnVieSBUZXN0MRIwEAYDVQQD

+ -Ewlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANt10EXesd+/

+ -caAOsKXmvPQcneUlZ2TFe8vxr8a+mqrqfg/MBa/vQGkGsskTnX7rogbi6n0Hx8eZ

+ -x/vVuOtjd2IrGBLDU1jQ9cdADAHRJoI0Fgnj3GX03LtdpUFg56l0utdMtqOcxYyJ

+ -r8vonwX+6v5kJL/n7eP20PzW6/wGghD7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEA

+ -hfXTBYuM9EMciPKPsvKTd7c9lcagNLwzatiFXz6GCBDFXMF2o1M83DiYI5fn2iGs

+ -6E08lnAp//8eSpoXK9sEYrnvq+qnpeh8sdXtMKhseN5RfuOKwqRkqGOivP1DnPNV

+ -fVTJathTHEtrA6q2GeakT0cAlsVCWYVOw07NQYJTEPg=

+ +MIID+TCCAuGgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UEBhMCSlAx

+ +EDAOBgNVBAgMB1NoaW1hbmUxFDASBgNVBAcMC01hdHotZSBjaXR5MRcwFQYDVQQK

+ +DA5SdWJ5IENvcmUgVGVhbTEVMBMGA1UEAwwMUnVieSBUZXN0IENBMSUwIwYJKoZI

+ +hvcNAQkBFhZzZWN1cml0eUBydWJ5LWxhbmcub3JnMB4XDTE5MDEwMjAzMDY1M1oX

+ +DTI0MDEwMTAzMDY1M1owdjELMAkGA1UEBhMCSlAxEDAOBgNVBAgMB1NoaW1hbmUx

+ +FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDDAxSdWJ5IFRlc3QgQ0Ex

+ +JTAjBgkqhkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwggEiMA0GCSqG

+ +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBqWTv0/LhGn8k339lhsGYVRaDkRZbY24m

+ +u8BzaHv3ALo323+pXMiYqkOWh+GgY2kM2CKQ9VYisVducTswBNBkTTgzoOrBFj0W

+ +vsBJTPAUFa8Jldq/xyM0w32vt3CzbRveIZPAfGwO/Q7l//OAUQzfgHxARsnKV9SI

+ +Ag/wHhQY8ZgPxkIdzJApcRuvSiLg54b83dPYhA5e8JuTXwqaHfj18+fHsHoOJSAT

+ +Ahoiwtngf0+hf3L25uEUfMWTf6aWO6vY8dwrAdbl/lzPCNsG6f19vf4s9Ip7nxWI

+ +BS73usmGfhRQ9JahhBdd94sKehQs3soAdPgjMp1mrxymWBregpapAgMBAAGjezB5

+ +MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENl

+ +cnRpZmljYXRlMB0GA1UdDgQWBBTyyTUFMe8I7u+w/hpywp5w4+PsQzAfBgNVHSME

+ +GDAWgBT20SIp1T0j116tDJzmdY+dzfidUzANBgkqhkiG9w0BAQsFAAOCAQEAAucK

+ +Inxe2ZLSuftKv3U/AOYZPpClnThBgkxvufPyWKGRf0rUKDicfE1sLy+V9VVVJaFx

+ +DAVCCKOmq+MER5pCJI+yulBVr7jX/BoTkl11feFNh15XgsVf1rjqhk4FsH8HJ6U2

+ +Hx5U8TI1f5x1JmohdTcyu4kBeJfM09466M5F7RIkLqglc7PNcEe4gfkGqo2HL6nN

+ +/nlAzMlHPS+CwoK/XYoGW6mQ07Cn/PMa+w7Lj9jyTvSNu0vVLSDAbtUIK4EyxODS

+ +SzEn8VWWDtS5kgJxmGnlc8xSRaAH+yiesPyxWEJaCEowSeXxpcjVimfw7Z4/G3Gm

+ +gJGByxo9tY6HnWQozg==

+  -----END CERTIFICATE-----

+ diff --git a/test/net/fixtures/server.key b/test/net/fixtures/server.key

+ index 7c57546ece..1e73232728 100644

+ --- a/test/net/fixtures/server.key

+ +++ b/test/net/fixtures/server.key

+ @@ -1,15 +1,28 @@

+ ------BEGIN RSA PRIVATE KEY-----

+ -MIICXQIBAAKBgQDbddBF3rHfv3GgDrCl5rz0HJ3lJWdkxXvL8a/Gvpqq6n4PzAWv

+ -70BpBrLJE51+66IG4up9B8fHmcf71bjrY3diKxgSw1NY0PXHQAwB0SaCNBYJ49xl

+ -9Ny7XaVBYOepdLrXTLajnMWMia/L6J8F/ur+ZCS/5+3j9tD81uv8BoIQ+wIDAQAB

+ -AoGAGtYHR+P5gFDaxiXFuCPFC1zMeg7e29XCU6gURIteQnQ2QhxCvcbV64HkLu51

+ -HeYWhB0Pa4aeCWxmpgb2e+JH4MEoIjeJSGyZQeqwkQLgWJDdvkgWx5am58QzA60I

+ -ipkZ9QHcPffSs5RiGx4yfr58KqAmwFphGCY8W7v4LqaENdECQQD9H5VTW9g4gj1c

+ -j3uNYvSI/D7a9P7gfI+ziczuwMm5xsBx3D/t5TAr3SJKNne3sl1E6ZERCUbzxf+C

+ -k58EiHx1AkEA3fRLGqDOq7EcQhbjTcA/v/t5MwlGEUsS9+XrqOWn50YuoIwRZJ3v

+ -qHRQzfQfFNklGtfBvwQ4md3irXjMeGVprwJBAMEAuwiDiHuV+xm/ofKtmE13IKot

+ -ksYy1BOOp/8IawhHXueyi+BmF/PqOkIiA+jCjNGF0oIN89beizPSQbbgJx0CQG/K

+ -qL1bu1ys0y/SeWBi8XkP/0aeaCUzq/UiYCTsrzoEll2UzvnftqMhGsXxLGqCyHaR

+ -r2s3hA6zvIVlL4+AfM8CQQClq+WDrC5VKciLYakZNWJjV1m+H2Ut/0fXdUjKHajE

+ -FWLcsrOhADf6bkTb71GwPxnKRkkRmud5upP0ZYYTqM4X

+ ------END RSA PRIVATE KEY-----

+ +-----BEGIN PRIVATE KEY-----

+ +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDBqWTv0/LhGn8k

+ +339lhsGYVRaDkRZbY24mu8BzaHv3ALo323+pXMiYqkOWh+GgY2kM2CKQ9VYisVdu

+ +cTswBNBkTTgzoOrBFj0WvsBJTPAUFa8Jldq/xyM0w32vt3CzbRveIZPAfGwO/Q7l

+ +//OAUQzfgHxARsnKV9SIAg/wHhQY8ZgPxkIdzJApcRuvSiLg54b83dPYhA5e8JuT

+ +XwqaHfj18+fHsHoOJSATAhoiwtngf0+hf3L25uEUfMWTf6aWO6vY8dwrAdbl/lzP

+ +CNsG6f19vf4s9Ip7nxWIBS73usmGfhRQ9JahhBdd94sKehQs3soAdPgjMp1mrxym

+ +WBregpapAgMBAAECggEAYQJ20oBMcSBxwknGqlfnkGRHI97A4UScgACa9fTH7EJM

+ +BgEJIRCeV4Mq2jP0/P/vNoTqQ8zxue02C9fiuzoeHbBkz8/y6Ig4T7V74vwMYzM9

+ +fEK50klxxFONGUF9zhOA2zPcrJZnFtcC6InfM07mcOsO0q/jE14N05ec3j5i+N7j

+ +hDHsHjS3hUiSEGra/U6TRGA26imDUZR5S3h3WMuFmpQgAg0STHc2inYjS9iVhn+T

+ +uAV2igYR89MOTcH1ZVoxjeYXwhqjWT6Kbw4Er4TWTVzwGf9ktv04EjZjhgUAqw7Q

+ +8Sc7Olt2q2tA7hQqdgJVgNMaszHqpKAECbAfuxuDtQKBgQD/r0zI9ZcTDQOgezaB

+ +s9UGbT5O5LruxLc/ExHRL7gpU7UsF/cc3Hp9zmDrzuUsq+UZlGewNnPBLHzaEq1z

+ +AZD9aa85umzXxcLzyg9ZnvN4kHLKIXhnnTEiShHtpRbqfybBKM7J+iQxXIYUf5tl

+ +lHTfEqG2/nTt4E50dhniIbIaAwKBgQDB5oS3LGXSn6zAWyUsAJaSeS8/3/O4Vz+x

+ +u8tZrICSFWBodwg46eHR9I379eayKhMGCsaAWx4ybWJWWEb/nM+fBGxBSnxb9jmm

+ +gHu93BQjK3sWS8qAGTwO5ehLEy0QRcCc+wb0lyo9hfh1grJioESVsiB9SXrxp8dr

+ +45JvxCCC4wKBgDGSKQ7lHm8hHMzmVoD6/pgKYgQlsGBOX0CpT9EAsXHBuuRbmRtN

+ +W6o8cuoE6MWqZfZ5oUi2peaT23jkGiCr8xJOhRxqGmQTAWMGj8dOW+HKD5dEufVM

+ +spP1TFiIo1K/aCIW6VCbYJz5VT1wKA6fo7EECbpSxxS/YjaOFyKSaddFAoGBAKk3

+ +bdcVrf70TqTIZlZSZRWLIMsTvPTBX9rSUxL9Um8qrKo+RzS0F9lNHaQn457UzSlW

+ +uglGe8HyaAGGpN9qkF7sUzVftcvjxEgklNkKeaB/z7mThzPn0dwGlIUARTGQThox

+ +kM5gJgLvKfgTiW49A93ISEZOnDbM/2KOhjt35A+VAoGAYsNAMBwjubVo0v1vqry+

+ +XG6VvPpgVjMiDQCsTEEcBqgRRuf6R5zndIhIvwmTNiUkGkE3w/vG0uCjtB82/kwE

+ +bzVheR0vZDN7s52OYRz4j0ddtYCqGSkvkWuEQfQFZUDTyLodwVQAT5aR+mcr4Qml

+ +uCiVeqoPl+JIg4m8Tz76XWo=

+ +-----END PRIVATE KEY-----

+ -- 

+ 2.20.1

+ 

+ 

+ From 1e0b49a293d3792826c67b7e05c5fcbd09c9ea6e Mon Sep 17 00:00:00 2001

+ From: kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>

+ Date: Wed, 2 Jan 2019 03:29:01 +0000

+ Subject: [PATCH 2/2] Try to update cert (2nd try)

+ 

+ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66686 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

+ ---

+  test/net/fixtures/server.crt | 115 +++++++++++++++++------------------

+  test/net/fixtures/server.key |  52 ++++++++--------

+  2 files changed, 83 insertions(+), 84 deletions(-)

+ 

+ diff --git a/test/net/fixtures/server.crt b/test/net/fixtures/server.crt

+ index 817ecc222c..5ca78a6d14 100644

+ --- a/test/net/fixtures/server.crt

+ +++ b/test/net/fixtures/server.crt

+ @@ -1,35 +1,35 @@

+  Certificate:

+      Data:

+          Version: 3 (0x2)

+ -        Serial Number: 1 (0x1)

+ +        Serial Number: 2 (0x2)

+      Signature Algorithm: sha256WithRSAEncryption

+          Issuer: C=JP, ST=Shimane, L=Matz-e city, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org

+          Validity

+ -            Not Before: Jan  2 03:06:53 2019 GMT

+ -            Not After : Jan  1 03:06:53 2024 GMT

+ -        Subject: C=JP, ST=Shimane, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org

+ +            Not Before: Jan  2 03:27:13 2019 GMT

+ +            Not After : Jan  1 03:27:13 2024 GMT

+ +        Subject: C=JP, ST=Shimane, O=Ruby Core Team, OU=Ruby Test, CN=localhost

+          Subject Public Key Info:

+              Public Key Algorithm: rsaEncryption

+                  Public-Key: (2048 bit)

+                  Modulus:

+ -                    00:c1:a9:64:ef:d3:f2:e1:1a:7f:24:df:7f:65:86:

+ -                    c1:98:55:16:83:91:16:5b:63:6e:26:bb:c0:73:68:

+ -                    7b:f7:00:ba:37:db:7f:a9:5c:c8:98:aa:43:96:87:

+ -                    e1:a0:63:69:0c:d8:22:90:f5:56:22:b1:57:6e:71:

+ -                    3b:30:04:d0:64:4d:38:33:a0:ea:c1:16:3d:16:be:

+ -                    c0:49:4c:f0:14:15:af:09:95:da:bf:c7:23:34:c3:

+ -                    7d:af:b7:70:b3:6d:1b:de:21:93:c0:7c:6c:0e:fd:

+ -                    0e:e5:ff:f3:80:51:0c:df:80:7c:40:46:c9:ca:57:

+ -                    d4:88:02:0f:f0:1e:14:18:f1:98:0f:c6:42:1d:cc:

+ -                    90:29:71:1b:af:4a:22:e0:e7:86:fc:dd:d3:d8:84:

+ -                    0e:5e:f0:9b:93:5f:0a:9a:1d:f8:f5:f3:e7:c7:b0:

+ -                    7a:0e:25:20:13:02:1a:22:c2:d9:e0:7f:4f:a1:7f:

+ -                    72:f6:e6:e1:14:7c:c5:93:7f:a6:96:3b:ab:d8:f1:

+ -                    dc:2b:01:d6:e5:fe:5c:cf:08:db:06:e9:fd:7d:bd:

+ -                    fe:2c:f4:8a:7b:9f:15:88:05:2e:f7:ba:c9:86:7e:

+ -                    14:50:f4:96:a1:84:17:5d:f7:8b:0a:7a:14:2c:de:

+ -                    ca:00:74:f8:23:32:9d:66:af:1c:a6:58:1a:de:82:

+ -                    96:a9

+ +                    00:e8:da:9c:01:2e:2b:10:ec:49:cd:5e:07:13:07:

+ +                    9c:70:9e:c6:74:bc:13:c2:e1:6f:c6:82:fd:e3:48:

+ +                    e0:2c:a5:68:c7:9e:42:de:60:54:65:e6:6a:14:57:

+ +                    7a:30:d0:cc:b5:b6:d9:c3:d2:df:c9:25:97:54:67:

+ +                    cf:f6:be:5e:cb:8b:ee:03:c5:e1:e2:f9:e7:f7:d1:

+ +                    0c:47:f0:b8:da:33:5a:ad:41:ad:e7:b5:a2:7b:b7:

+ +                    bf:30:da:60:f8:e3:54:a2:bc:3a:fd:1b:74:d9:dc:

+ +                    74:42:e9:29:be:df:ac:b4:4f:eb:32:f4:06:f1:e1:

+ +                    8c:4b:a8:8b:fb:29:e7:b1:bf:1d:01:ee:73:0f:f9:

+ +                    40:dc:d5:15:79:d9:c6:73:d0:c0:dd:cb:e4:da:19:

+ +                    47:80:c6:14:04:72:fd:9a:7c:8f:11:82:76:49:04:

+ +                    79:cc:f2:5c:31:22:95:13:3e:5d:40:a6:4d:e0:a3:

+ +                    02:26:7d:52:3b:bb:ed:65:a1:0f:ed:6b:b0:3c:d4:

+ +                    de:61:15:5e:d3:dd:68:09:9f:4a:57:a5:c2:a9:6d:

+ +                    86:92:c5:f4:a4:d4:b7:13:3b:52:63:24:05:e2:cc:

+ +                    e3:8a:3c:d4:35:34:2b:10:bb:58:72:e7:e1:8d:1d:

+ +                    74:8c:61:16:20:3d:d0:1c:4e:8f:6e:fd:fe:64:10:

+ +                    4f:41

+                  Exponent: 65537 (0x10001)

+          X509v3 extensions:

+              X509v3 Basic Constraints: 

+ @@ -37,47 +37,46 @@ Certificate:

+              Netscape Comment: 

+                  OpenSSL Generated Certificate

+              X509v3 Subject Key Identifier: 

+ -                F2:C9:35:05:31:EF:08:EE:EF:B0:FE:1A:72:C2:9E:70:E3:E3:EC:43

+ +                ED:28:C2:7E:AB:4B:C8:E8:FE:55:6D:66:95:31:1C:2D:60:F9:02:36

+              X509v3 Authority Key Identifier: 

+                  keyid:F6:D1:22:29:D5:3D:23:D7:5E:AD:0C:9C:E6:75:8F:9D:CD:F8:9D:53

+  

+      Signature Algorithm: sha256WithRSAEncryption

+ -         02:e7:0a:22:7c:5e:d9:92:d2:b9:fb:4a:bf:75:3f:00:e6:19:

+ -         3e:90:a5:9d:38:41:82:4c:6f:b9:f3:f2:58:a1:91:7f:4a:d4:

+ -         28:38:9c:7c:4d:6c:2f:2f:95:f5:55:55:25:a1:71:0c:05:42:

+ -         08:a3:a6:ab:e3:04:47:9a:42:24:8f:b2:ba:50:55:af:b8:d7:

+ -         fc:1a:13:92:5d:75:7d:e1:4d:87:5e:57:82:c5:5f:d6:b8:ea:

+ -         86:4e:05:b0:7f:07:27:a5:36:1f:1e:54:f1:32:35:7f:9c:75:

+ -         26:6a:21:75:37:32:bb:89:01:78:97:cc:d3:de:3a:e8:ce:45:

+ -         ed:12:24:2e:a8:25:73:b3:cd:70:47:b8:81:f9:06:aa:8d:87:

+ -         2f:a9:cd:fe:79:40:cc:c9:47:3d:2f:82:c2:82:bf:5d:8a:06:

+ -         5b:a9:90:d3:b0:a7:fc:f3:1a:fb:0e:cb:8f:d8:f2:4e:f4:8d:

+ -         bb:4b:d5:2d:20:c0:6e:d5:08:2b:81:32:c4:e0:d2:4b:31:27:

+ -         f1:55:96:0e:d4:b9:92:02:71:98:69:e5:73:cc:52:45:a0:07:

+ -         fb:28:9e:b0:fc:b1:58:42:5a:08:4a:30:49:e5:f1:a5:c8:d5:

+ -         8a:67:f0:ed:9e:3f:1b:71:a6:80:91:81:cb:1a:3d:b5:8e:87:

+ -         9d:64:28:ce

+ +         1d:b8:c5:8b:72:41:20:65:ad:27:6f:15:63:06:26:12:8d:9c:

+ +         ad:ca:f4:db:97:b4:90:cb:ff:35:94:bb:2a:a7:a1:ab:1e:35:

+ +         2d:a5:3f:c9:24:b0:1a:58:89:75:3e:81:0a:2c:4f:98:f9:51:

+ +         fb:c0:a3:09:d0:0a:9b:e7:a2:b7:c3:60:40:c8:f4:6d:b2:6a:

+ +         56:12:17:4c:00:24:31:df:9c:60:ae:b1:68:54:a9:e6:b5:4a:

+ +         04:e6:92:05:86:d9:5a:dc:96:30:a5:58:de:14:99:0f:e5:15:

+ +         89:3e:9b:eb:80:e3:bd:83:c3:ea:33:35:4b:3e:2f:d3:0d:64:

+ +         93:67:7f:8d:f5:3f:0c:27:bc:37:5a:cc:d6:47:16:af:5a:62:

+ +         d2:da:51:f8:74:06:6b:24:ad:28:68:08:98:37:7d:ed:0e:ab:

+ +         1e:82:61:05:d0:ba:75:a0:ab:21:b0:9a:fd:2b:54:86:1d:0d:

+ +         1f:c2:d4:77:1f:72:26:5e:ad:8a:9f:09:36:6d:44:be:74:c2:

+ +         5a:3e:ff:5c:9d:75:d6:38:7b:c5:39:f9:44:6e:a1:d1:8e:ff:

+ +         63:db:c4:bb:c6:91:92:ca:5c:60:9b:1d:eb:0a:de:08:ee:bf:

+ +         da:76:03:65:62:29:8b:f8:7f:c7:86:73:1e:f6:1f:2d:89:69:

+ +         fd:be:bd:6e

+  -----BEGIN CERTIFICATE-----

+ -MIID+TCCAuGgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UEBhMCSlAx

+ +MIID4zCCAsugAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UEBhMCSlAx

+  EDAOBgNVBAgMB1NoaW1hbmUxFDASBgNVBAcMC01hdHotZSBjaXR5MRcwFQYDVQQK

+  DA5SdWJ5IENvcmUgVGVhbTEVMBMGA1UEAwwMUnVieSBUZXN0IENBMSUwIwYJKoZI

+ -hvcNAQkBFhZzZWN1cml0eUBydWJ5LWxhbmcub3JnMB4XDTE5MDEwMjAzMDY1M1oX

+ -DTI0MDEwMTAzMDY1M1owdjELMAkGA1UEBhMCSlAxEDAOBgNVBAgMB1NoaW1hbmUx

+ -FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDDAxSdWJ5IFRlc3QgQ0Ex

+ -JTAjBgkqhkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwggEiMA0GCSqG

+ -SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBqWTv0/LhGn8k339lhsGYVRaDkRZbY24m

+ -u8BzaHv3ALo323+pXMiYqkOWh+GgY2kM2CKQ9VYisVducTswBNBkTTgzoOrBFj0W

+ -vsBJTPAUFa8Jldq/xyM0w32vt3CzbRveIZPAfGwO/Q7l//OAUQzfgHxARsnKV9SI

+ -Ag/wHhQY8ZgPxkIdzJApcRuvSiLg54b83dPYhA5e8JuTXwqaHfj18+fHsHoOJSAT

+ -Ahoiwtngf0+hf3L25uEUfMWTf6aWO6vY8dwrAdbl/lzPCNsG6f19vf4s9Ip7nxWI

+ -BS73usmGfhRQ9JahhBdd94sKehQs3soAdPgjMp1mrxymWBregpapAgMBAAGjezB5

+ -MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENl

+ -cnRpZmljYXRlMB0GA1UdDgQWBBTyyTUFMe8I7u+w/hpywp5w4+PsQzAfBgNVHSME

+ -GDAWgBT20SIp1T0j116tDJzmdY+dzfidUzANBgkqhkiG9w0BAQsFAAOCAQEAAucK

+ -Inxe2ZLSuftKv3U/AOYZPpClnThBgkxvufPyWKGRf0rUKDicfE1sLy+V9VVVJaFx

+ -DAVCCKOmq+MER5pCJI+yulBVr7jX/BoTkl11feFNh15XgsVf1rjqhk4FsH8HJ6U2

+ -Hx5U8TI1f5x1JmohdTcyu4kBeJfM09466M5F7RIkLqglc7PNcEe4gfkGqo2HL6nN

+ -/nlAzMlHPS+CwoK/XYoGW6mQ07Cn/PMa+w7Lj9jyTvSNu0vVLSDAbtUIK4EyxODS

+ -SzEn8VWWDtS5kgJxmGnlc8xSRaAH+yiesPyxWEJaCEowSeXxpcjVimfw7Z4/G3Gm

+ -gJGByxo9tY6HnWQozg==

+ +hvcNAQkBFhZzZWN1cml0eUBydWJ5LWxhbmcub3JnMB4XDTE5MDEwMjAzMjcxM1oX

+ +DTI0MDEwMTAzMjcxM1owYDELMAkGA1UEBhMCSlAxEDAOBgNVBAgMB1NoaW1hbmUx

+ +FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRIwEAYDVQQLDAlSdWJ5IFRlc3QxEjAQ

+ +BgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB

+ +AOjanAEuKxDsSc1eBxMHnHCexnS8E8Lhb8aC/eNI4CylaMeeQt5gVGXmahRXejDQ

+ +zLW22cPS38kll1Rnz/a+XsuL7gPF4eL55/fRDEfwuNozWq1Bree1onu3vzDaYPjj

+ +VKK8Ov0bdNncdELpKb7frLRP6zL0BvHhjEuoi/sp57G/HQHucw/5QNzVFXnZxnPQ

+ +wN3L5NoZR4DGFARy/Zp8jxGCdkkEeczyXDEilRM+XUCmTeCjAiZ9Uju77WWhD+1r

+ +sDzU3mEVXtPdaAmfSlelwqlthpLF9KTUtxM7UmMkBeLM44o81DU0KxC7WHLn4Y0d

+ +dIxhFiA90BxOj279/mQQT0ECAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhC

+ +AQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFO0o

+ +wn6rS8jo/lVtZpUxHC1g+QI2MB8GA1UdIwQYMBaAFPbRIinVPSPXXq0MnOZ1j53N

+ ++J1TMA0GCSqGSIb3DQEBCwUAA4IBAQAduMWLckEgZa0nbxVjBiYSjZytyvTbl7SQ

+ +y/81lLsqp6GrHjUtpT/JJLAaWIl1PoEKLE+Y+VH7wKMJ0Aqb56K3w2BAyPRtsmpW

+ +EhdMACQx35xgrrFoVKnmtUoE5pIFhtla3JYwpVjeFJkP5RWJPpvrgOO9g8PqMzVL

+ +Pi/TDWSTZ3+N9T8MJ7w3WszWRxavWmLS2lH4dAZrJK0oaAiYN33tDqsegmEF0Lp1

+ +oKshsJr9K1SGHQ0fwtR3H3ImXq2Knwk2bUS+dMJaPv9cnXXWOHvFOflEbqHRjv9j

+ +28S7xpGSylxgmx3rCt4I7r/adgNlYimL+H/HhnMe9h8tiWn9vr1u

+  -----END CERTIFICATE-----

+ diff --git a/test/net/fixtures/server.key b/test/net/fixtures/server.key

+ index 1e73232728..7f2380e71e 100644

+ --- a/test/net/fixtures/server.key

+ +++ b/test/net/fixtures/server.key

+ @@ -1,28 +1,28 @@

+  -----BEGIN PRIVATE KEY-----

+ -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDBqWTv0/LhGn8k

+ -339lhsGYVRaDkRZbY24mu8BzaHv3ALo323+pXMiYqkOWh+GgY2kM2CKQ9VYisVdu

+ -cTswBNBkTTgzoOrBFj0WvsBJTPAUFa8Jldq/xyM0w32vt3CzbRveIZPAfGwO/Q7l

+ -//OAUQzfgHxARsnKV9SIAg/wHhQY8ZgPxkIdzJApcRuvSiLg54b83dPYhA5e8JuT

+ -XwqaHfj18+fHsHoOJSATAhoiwtngf0+hf3L25uEUfMWTf6aWO6vY8dwrAdbl/lzP

+ -CNsG6f19vf4s9Ip7nxWIBS73usmGfhRQ9JahhBdd94sKehQs3soAdPgjMp1mrxym

+ -WBregpapAgMBAAECggEAYQJ20oBMcSBxwknGqlfnkGRHI97A4UScgACa9fTH7EJM

+ -BgEJIRCeV4Mq2jP0/P/vNoTqQ8zxue02C9fiuzoeHbBkz8/y6Ig4T7V74vwMYzM9

+ -fEK50klxxFONGUF9zhOA2zPcrJZnFtcC6InfM07mcOsO0q/jE14N05ec3j5i+N7j

+ -hDHsHjS3hUiSEGra/U6TRGA26imDUZR5S3h3WMuFmpQgAg0STHc2inYjS9iVhn+T

+ -uAV2igYR89MOTcH1ZVoxjeYXwhqjWT6Kbw4Er4TWTVzwGf9ktv04EjZjhgUAqw7Q

+ -8Sc7Olt2q2tA7hQqdgJVgNMaszHqpKAECbAfuxuDtQKBgQD/r0zI9ZcTDQOgezaB

+ -s9UGbT5O5LruxLc/ExHRL7gpU7UsF/cc3Hp9zmDrzuUsq+UZlGewNnPBLHzaEq1z

+ -AZD9aa85umzXxcLzyg9ZnvN4kHLKIXhnnTEiShHtpRbqfybBKM7J+iQxXIYUf5tl

+ -lHTfEqG2/nTt4E50dhniIbIaAwKBgQDB5oS3LGXSn6zAWyUsAJaSeS8/3/O4Vz+x

+ -u8tZrICSFWBodwg46eHR9I379eayKhMGCsaAWx4ybWJWWEb/nM+fBGxBSnxb9jmm

+ -gHu93BQjK3sWS8qAGTwO5ehLEy0QRcCc+wb0lyo9hfh1grJioESVsiB9SXrxp8dr

+ -45JvxCCC4wKBgDGSKQ7lHm8hHMzmVoD6/pgKYgQlsGBOX0CpT9EAsXHBuuRbmRtN

+ -W6o8cuoE6MWqZfZ5oUi2peaT23jkGiCr8xJOhRxqGmQTAWMGj8dOW+HKD5dEufVM

+ -spP1TFiIo1K/aCIW6VCbYJz5VT1wKA6fo7EECbpSxxS/YjaOFyKSaddFAoGBAKk3

+ -bdcVrf70TqTIZlZSZRWLIMsTvPTBX9rSUxL9Um8qrKo+RzS0F9lNHaQn457UzSlW

+ -uglGe8HyaAGGpN9qkF7sUzVftcvjxEgklNkKeaB/z7mThzPn0dwGlIUARTGQThox

+ -kM5gJgLvKfgTiW49A93ISEZOnDbM/2KOhjt35A+VAoGAYsNAMBwjubVo0v1vqry+

+ -XG6VvPpgVjMiDQCsTEEcBqgRRuf6R5zndIhIvwmTNiUkGkE3w/vG0uCjtB82/kwE

+ -bzVheR0vZDN7s52OYRz4j0ddtYCqGSkvkWuEQfQFZUDTyLodwVQAT5aR+mcr4Qml

+ -uCiVeqoPl+JIg4m8Tz76XWo=

+ +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDo2pwBLisQ7EnN

+ +XgcTB5xwnsZ0vBPC4W/Ggv3jSOAspWjHnkLeYFRl5moUV3ow0My1ttnD0t/JJZdU

+ +Z8/2vl7Li+4DxeHi+ef30QxH8LjaM1qtQa3ntaJ7t78w2mD441SivDr9G3TZ3HRC

+ +6Sm+36y0T+sy9Abx4YxLqIv7Keexvx0B7nMP+UDc1RV52cZz0MDdy+TaGUeAxhQE

+ +cv2afI8RgnZJBHnM8lwxIpUTPl1Apk3gowImfVI7u+1loQ/ta7A81N5hFV7T3WgJ

+ +n0pXpcKpbYaSxfSk1LcTO1JjJAXizOOKPNQ1NCsQu1hy5+GNHXSMYRYgPdAcTo9u

+ +/f5kEE9BAgMBAAECggEBAOHkwhc7DLh8IhTDNSW26oMu5OP2WU1jmiYAigDmf+OQ

+ +DBgrZj+JQBci8qINQxL8XLukSZn5hvQCLc7Kbyu1/wyEEUFDxSGGwwzclodr9kho

+ +LX2LDASPZrOSzD2+fPi2wTKmXKuS6Uc44OjQfZkYMNkz9r4Vkm8xGgOD3VipjIYX

+ +QXlhhdqkXZcNABsihCV52GKkDFSVm8jv95YJc5xhoYCy/3a4/qPdF0aT2R7oYUej

+ +hKrxVDskyooe8Zg/JTydZNV5GQEDmW01/K3r6XGT26oPi1AqMU1gtv/jkW56CRQQ

+ +1got8smnqM+AV7Slf9R6DauIPdQJ2S8wsr/o8ISBsOECgYEA9YrqEP2gAYSGFXRt

+ +liw0WI2Ant8BqXS6yvq1jLo/qWhLw/ph4Di73OQ2mpycVTpgfGr2wFPQR1XJ+0Fd

+ +U+Ir/C3Q7FK4VIGHK7B0zNvZr5tEjlFfeRezo2JMVw5YWeSagIFcSwK+KqCTH9qc

+ +pw/Eb8nB/4XNcpTZu7Fg0Wc+ooUCgYEA8sVaicn1Wxkpb45a4qfrA6wOr5xdJ4cC

+ +A5qs7vjX2OdPIQOmoQhdI7bCWFXZzF33wA4YCws6j5wRaySLIJqdms8Gl9QnODy1

+ +ZlA5gwKToBC/jqPmWAXSKb8EH7cHilaxU9OKnQ7CfwlGLHqjMtjrhR7KHlt3CVRs

+ +oRmvsjZVXI0CgYAmPedslAO6mMhFSSfULrhMXmV82OCqYrrA6EEkVNGbcdnzAOkD

+ +gfKIWabDd8bFY10po4Mguy0CHzNhBXIioWQWV5BlbhC1YKMLw+S9DzSdLAKGY9gJ

+ +xQ4+UQ3wtRQ/k+IYR413RUsW2oFvgZ3KSyNeAb9MK6uuv84VdG/OzVSs/QKBgQDn

+ +kap//l2EbObiWyaERunckdVcW0lcN+KK75J/TGwPoOwQsLvTpPe65kxRGGrtDsEQ

+ +uCDk/+v3KkZPLgdrrTAih9FhJ+PVN8tMcb+6IM4SA4fFFr/UPJEwct0LJ3oQ0grJ

+ +y+HPWFHb/Uurh7t99/4H98uR02sjQh1wOeEmm78mzQKBgQDm+LzGH0se6CXQ6cdZ

+ +g1JRZeXkDEsrW3hfAsW62xJQmXcWxBoblP9OamMY+A06rM5og3JbDk5Zm6JsOaA8

+ +wS2gw4ilp46jors4eQey8ux7kB9LzdBoDBBElnsbjLO8oBNZlVcYXg+6BOl/CUi7

+ +2whRF0FEjKA8ehrNhAq+VFfFNw==

+  -----END PRIVATE KEY-----

+ -- 

+ 2.20.1

+ 

@@ -0,0 +1,44 @@

+ From e71ca6cdcf108e6a2fa47ec9fadefe7554717908 Mon Sep 17 00:00:00 2001

+ From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>

+ Date: Fri, 26 Oct 2018 01:47:09 +0000

+ Subject: [PATCH] Update for tzdata-2018f

+ 

+ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

+ ---

+  test/ruby/test_time_tz.rb | 12 +++++++++---

+  1 file changed, 9 insertions(+), 3 deletions(-)

+ 

+ diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb

+ index 2da4fd8d9ce4..328fde48fc34 100644

+ --- a/test/ruby/test_time_tz.rb

+ +++ b/test/ruby/test_time_tz.rb

+ @@ -86,7 +86,9 @@ def group_by(e, &block)

+    has_lisbon_tz &&= have_tz_offset?("Europe/Lisbon")

+    CORRECT_TOKYO_DST_1951 = with_tz("Asia/Tokyo") {

+      if Time.local(1951, 5, 6, 12, 0, 0).dst? # noon, DST

+ -      Time.local(1951, 5, 6, 1, 0, 0).dst?   # DST with fixed tzdata

+ +      if Time.local(1951, 5, 6, 1, 0, 0).dst? # DST with fixed tzdata

+ +        Time.local(1951, 9, 8, 23, 0, 0).dst? ? "2018f" : "2018e"

+ +      end

+      end

+    }

+    CORRECT_KIRITIMATI_SKIP_1994 = with_tz("Pacific/Kiritimati") {

+ @@ -347,12 +349,16 @@ def self.gen_zdump_test(data)

+  Asia/Singapore  Thu Dec 31 16:29:59 1981 UTC = Thu Dec 31 23:59:59 1981 SGT isdst=0 gmtoff=27000

+  Asia/Singapore  Thu Dec 31 16:30:00 1981 UTC = Fri Jan  1 00:30:00 1982 SGT isdst=0 gmtoff=28800

+  End

+ -  gen_zdump_test CORRECT_TOKYO_DST_1951 ? <<'End' : <<'End'

+ +  gen_zdump_test CORRECT_TOKYO_DST_1951 ? <<'End' + (CORRECT_TOKYO_DST_1951 < "2018f" ? <<'2018e' : <<'2018f') : <<'End'

+  Asia/Tokyo  Sat May  5 14:59:59 1951 UTC = Sat May  5 23:59:59 1951 JST isdst=0 gmtoff=32400

+  Asia/Tokyo  Sat May  5 15:00:00 1951 UTC = Sun May  6 01:00:00 1951 JDT isdst=1 gmtoff=36000

+ +End

+  Asia/Tokyo  Sat Sep  8 13:59:59 1951 UTC = Sat Sep  8 23:59:59 1951 JDT isdst=1 gmtoff=36000

+  Asia/Tokyo  Sat Sep  8 14:00:00 1951 UTC = Sat Sep  8 23:00:00 1951 JST isdst=0 gmtoff=32400

+ -End

+ +2018e

+ +Asia/Tokyo  Sat Sep  8 14:59:59 1951 UTC = Sun Sep  9 00:59:59 1951 JDT isdst=1 gmtoff=36000

+ +Asia/Tokyo  Sat Sep  8 15:00:00 1951 UTC = Sun Sep  9 00:00:00 1951 JST isdst=0 gmtoff=32400

+ +2018f

+  Asia/Tokyo  Sat May  5 16:59:59 1951 UTC = Sun May  6 01:59:59 1951 JST isdst=0 gmtoff=32400

+  Asia/Tokyo  Sat May  5 17:00:00 1951 UTC = Sun May  6 03:00:00 1951 JDT isdst=1 gmtoff=36000

+  Asia/Tokyo  Fri Sep  7 15:59:59 1951 UTC = Sat Sep  8 01:59:59 1951 JDT isdst=1 gmtoff=36000

@@ -1,203 +0,0 @@

- From 6fcc6c0efc42d1c6325cf4bb0ca16e2a448cdbed Mon Sep 17 00:00:00 2001

- From: Kazuki Yamaguchi <k@rhe.jp>

- Date: Mon, 6 Aug 2018 20:51:42 +0900

- Subject: [PATCH] test/test_ssl: fix test failure with TLS 1.3

- 

- SSL_connect() on the client side may return before SSL_accept() on

- server side returns. This will fix test failures with OpenSSL's current

- master.

- ---

-  test/openssl/test_ssl.rb         | 45 ++++++++++++++++++++++++++--------------

-  test/openssl/test_ssl_session.rb |  1 +

-  2 files changed, 31 insertions(+), 15 deletions(-)

- 

- diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb

- index 7bb32adf..408c7d82 100644

- --- a/test/openssl/test_ssl.rb

- +++ b/test/openssl/test_ssl.rb

- @@ -47,6 +47,8 @@ def test_ssl_with_server_cert

-          assert_equal 2, ssl.peer_cert_chain.size

-          assert_equal @svr_cert.to_der, ssl.peer_cert_chain[0].to_der

-          assert_equal @ca_cert.to_der, ssl.peer_cert_chain[1].to_der

- +

- +        ssl.puts "abc"; assert_equal "abc\n", ssl.gets

-        ensure

-          ssl&.close

-          sock&.close

- @@ -157,6 +159,7 @@ def test_sync_close

-          sock = TCPSocket.new("127.0.0.1", port)

-          ssl = OpenSSL::SSL::SSLSocket.new(sock)

-          ssl.connect

- +        ssl.puts "abc"; assert_equal "abc\n", ssl.gets

-          ssl.close

-          assert_not_predicate sock, :closed?

-        ensure

- @@ -168,6 +171,7 @@ def test_sync_close

-          ssl = OpenSSL::SSL::SSLSocket.new(sock)

-          ssl.sync_close = true  # !!

-          ssl.connect

- +        ssl.puts "abc"; assert_equal "abc\n", ssl.gets

-          ssl.close

-          assert_predicate sock, :closed?

-        ensure

- @@ -259,7 +263,10 @@ def test_client_ca

-          client_ca_from_server = sslconn.client_ca

-          [@cli_cert, @cli_key]

-        end

- -      server_connect(port, ctx) { |ssl| assert_equal([@ca], client_ca_from_server) }

- +      server_connect(port, ctx) { |ssl|

- +        assert_equal([@ca], client_ca_from_server)

- +        ssl.puts "abc"; assert_equal "abc\n", ssl.gets

- +      }

-      }

-    end

-  

- @@ -356,21 +363,16 @@ def test_verify_result

-      }

-  

-      start_server { |port|

- -      sock = TCPSocket.new("127.0.0.1", port)

-        ctx = OpenSSL::SSL::SSLContext.new

-        ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER

-        ctx.verify_callback = Proc.new do |preverify_ok, store_ctx|

-          store_ctx.error = OpenSSL::X509::V_OK

-          true

-        end

- -      ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)

- -      ssl.sync_close = true

- -      begin

- -        ssl.connect

- +      server_connect(port, ctx) { |ssl|

-          assert_equal(OpenSSL::X509::V_OK, ssl.verify_result)

- -      ensure

- -        ssl.close

- -      end

- +        ssl.puts "abc"; assert_equal "abc\n", ssl.gets

- +      }

-      }

-  

-      start_server(ignore_listener_error: true) { |port|

- @@ -455,6 +457,8 @@ def test_post_connection_check

-  

-      start_server { |port|

-        server_connect(port) { |ssl|

- +        ssl.puts "abc"; assert_equal "abc\n", ssl.gets

- +

-          assert_raise(sslerr){ssl.post_connection_check("localhost.localdomain")}

-          assert_raise(sslerr){ssl.post_connection_check("127.0.0.1")}

-          assert(ssl.post_connection_check("localhost"))

- @@ -476,6 +482,8 @@ def test_post_connection_check

-      @svr_cert = issue_cert(@svr, @svr_key, 4, exts, @ca_cert, @ca_key)

-      start_server { |port|

-        server_connect(port) { |ssl|

- +        ssl.puts "abc"; assert_equal "abc\n", ssl.gets

- +

-          assert(ssl.post_connection_check("localhost.localdomain"))

-          assert(ssl.post_connection_check("127.0.0.1"))

-          assert_raise(sslerr){ssl.post_connection_check("localhost")}

- @@ -496,6 +502,8 @@ def test_post_connection_check

-      @svr_cert = issue_cert(@svr, @svr_key, 5, exts, @ca_cert, @ca_key)

-      start_server { |port|

-        server_connect(port) { |ssl|

- +        ssl.puts "abc"; assert_equal "abc\n", ssl.gets

- +

-          assert(ssl.post_connection_check("localhost.localdomain"))

-          assert_raise(sslerr){ssl.post_connection_check("127.0.0.1")}

-          assert_raise(sslerr){ssl.post_connection_check("localhost")}

- @@ -722,6 +730,8 @@ def test_tlsext_hostname

-          ssl.connect

-          assert_equal @cli_cert.serial, ssl.peer_cert.serial

-          assert_predicate fooctx, :frozen?

- +

- +        ssl.puts "abc"; assert_equal "abc\n", ssl.gets

-        ensure

-          ssl&.close

-          sock.close

- @@ -733,6 +743,8 @@ def test_tlsext_hostname

-          ssl.hostname = "bar.example.com"

-          ssl.connect

-          assert_equal @svr_cert.serial, ssl.peer_cert.serial

- +

- +        ssl.puts "abc"; assert_equal "abc\n", ssl.gets

-        ensure

-          ssl&.close

-          sock.close

- @@ -805,7 +817,8 @@ def test_verify_hostname_on_connect

-            ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)

-            ssl.hostname = name

-            if expected_ok

- -            assert_nothing_raised { ssl.connect }

- +            ssl.connect

- +            ssl.puts "abc"; assert_equal "abc\n", ssl.gets

-            else

-              assert_handshake_error { ssl.connect }

-            end

- @@ -1086,6 +1099,7 @@ def test_renegotiation_cb

-      start_server_version(:SSLv23, ctx_proc) { |port|

-        server_connect(port) { |ssl|

-          assert_equal(1, num_handshakes)

- +        ssl.puts "abc"; assert_equal "abc\n", ssl.gets

-        }

-      }

-    end

- @@ -1104,6 +1118,7 @@ def test_alpn_protocol_selection_ary

-        ctx.alpn_protocols = advertised

-        server_connect(port, ctx) { |ssl|

-          assert_equal(advertised.first, ssl.alpn_protocol)

- +        ssl.puts "abc"; assert_equal "abc\n", ssl.gets

-        }

-      }

-    end

- @@ -1226,14 +1241,11 @@ def test_npn_selected_protocol_too_long

-    end

-  

-    def test_close_after_socket_close

- -    server_proc = proc { |ctx, ssl|

- -      # Do nothing

- -    }

- -    start_server(server_proc: server_proc) { |port|

- +    start_server { |port|

-        sock = TCPSocket.new("127.0.0.1", port)

-        ssl = OpenSSL::SSL::SSLSocket.new(sock)

- -      ssl.sync_close = true

-        ssl.connect

- +      ssl.puts "abc"; assert_equal "abc\n", ssl.gets

-        sock.close

-        assert_nothing_raised do

-          ssl.close

- @@ -1298,6 +1310,7 @@ def test_get_ephemeral_key

-          ctx.ciphers = "DEFAULT:!kRSA:!kEDH"

-          server_connect(port, ctx) { |ssl|

-            assert_instance_of OpenSSL::PKey::EC, ssl.tmp_key

- +          ssl.puts "abc"; assert_equal "abc\n", ssl.gets

-          }

-        end

-      end

- @@ -1440,6 +1453,7 @@ def test_ecdh_curves

-              assert_equal "secp384r1", ssl.tmp_key.group.curve_name

-            end

-          end

- +        ssl.puts "abc"; assert_equal "abc\n", ssl.gets

-        }

-  

-        if openssl?(1, 0, 2) || libressl?(2, 5, 1)

- @@ -1455,6 +1469,7 @@ def test_ecdh_curves

-  

-          server_connect(port, ctx) { |ssl|

-            assert_equal "secp521r1", ssl.tmp_key.group.curve_name

- +          ssl.puts "abc"; assert_equal "abc\n", ssl.gets

-          }

-        end

-      end

- diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb

- index 6db0c2d1..78b160ed 100644

- --- a/test/openssl/test_ssl_session.rb

- +++ b/test/openssl/test_ssl_session.rb

- @@ -113,6 +113,7 @@ def test_resumption

-      non_resumable = nil

-      start_server { |port|

-        server_connect_with_session(port, nil, nil) { |ssl|

- +        ssl.puts "abc"; assert_equal "abc\n", ssl.gets

-          non_resumable = ssl.session

-        }

-      }

file modified
+21 -14
@@ -1,6 +1,6 @@

  %global major_version 2

  %global minor_version 5

- %global teeny_version 1

+ %global teeny_version 3

  %global major_minor_version %{major_version}.%{minor_version}

  

  %global ruby_version %{major_minor_version}.%{teeny_version}
@@ -21,10 +21,10 @@

  %endif

  

  

- %global release 98

+ %global release 100

  %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}

  

- # The RubyGems library has to stay out of Ruby directory three, since the

+ # The RubyGems library has to stay out of Ruby directory tree, since the

  # RubyGems should be share by all Ruby implementations.

  %global rubygems_dir %{_datadir}/rubygems

  
@@ -42,7 +42,7 @@

  %global json_version 2.1.0

  %global minitest_version 5.10.3

  %global net_telnet_version 0.1.1

- %global openssl_version 2.1.0

+ %global openssl_version 2.1.2

  %global power_assert_version 1.1.1

  %global psych_version 3.0.2

  %global rake_version 12.3.0
@@ -82,7 +82,7 @@

  # UCD: some of enc/trans/**/*.src

  License: (Ruby or BSD) and Public Domain and MIT and CC0 and zlib and UCD

  URL: http://ruby-lang.org/

- Source0: ftp://ftp.ruby-lang.org/pub/%{name}/%{major_minor_version}/%{ruby_archive}.tar.xz

+ Source0: https://cache.ruby-lang.org/pub/%{name}/%{major_minor_version}/%{ruby_archive}.tar.xz

  Source1: operating_system.rb

  # TODO: Try to push SystemTap support upstream.

  Source2: libruby.stp
@@ -136,20 +136,21 @@

  # Add Gem.operating_system_defaults to allow packagers to override defaults.

  # https://github.com/rubygems/rubygems/pull/2116

  Patch10: ruby-2.5.0-Add-Gem.operating_system_defaults.patch

- # TestTimeTZ test failures Kiritimati and Lisbon

- # https://bugs.ruby-lang.org/issues/14655

- Patch11: ruby-2.5.1-TestTimeTZ-test-failures-Kiritimati-and-Lisbon.patch

  # Don't force libraries used to build Ruby to its dependencies.

  # https://bugs.ruby-lang.org/issues/14422

  Patch15: ruby-2.6.0-library-options-to-MAINLIBS.patch

  # Do not require C++ compiler.

  # https://github.com/rubygems/rubygems/pull/2367

  Patch16: ruby-2.5.1-Avoid-need-of-C++-compiler-to-pass-the-test-suite.patch

+ # Fix Tokyo TZ tests.

+ # https://github.com/ruby/ruby/commit/e71ca6cdcf108e6a2fa47ec9fadefe7554717908

+ Patch25: ruby-2.6.0-Update-for-tzdata-2018f.patch

+ # Refresh expired certificates.

+ # https://bugs.ruby-lang.org/issues/15502

+ # https://github.com/ruby/ruby/commit/6f9b40ea53d8f3fb2a5b1c7ac55c207d42c77ef4

+ Patch11: ruby-2.6.0-Try-to-update-cert.patch

+ 

  # Fix some OpenSSL 1.1.1 test failures.

- # https://github.com/ruby/openssl/pull/202

- Patch17: ruby-2.5.1-Test-fixes-for-OpenSSL-1.1.1.patch

- # https://github.com/ruby/openssl/pull/209

- Patch18: ruby-2.6.0-fix-test-failure-with-TLS-1.3.patch

  # https://github.com/ruby/ruby/commit/1dfc377ae3b174b043d3f0ed36de57b0296b34d0

  Patch19: ruby-2.6.0-net-http-net-ftp-fix-session-resumption-with-TLS-1.3.patch

  
@@ -537,9 +538,8 @@

  %patch11 -p1

  %patch15 -p1

  %patch16 -p1

- %patch17 -p1

- %patch18 -p1

  %patch19 -p1

+ %patch25 -p1

  

  # Provide an example of usage of the tapset:

  cp -a %{SOURCE3} .
@@ -1089,6 +1089,13 @@

  %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec

  

  %changelog

+ * Fri Jan 11 2019 Jun Aruga <jaruga@redhat.com> - 2.5.3-100

+ - Fix Tokyo TZ tests.

+ - Refresh expired certificates to fix FTBFS.

+ 

+ * Fri Oct 19 2018 Jun Aruga <jaruga@redhat.com> - 2.5.3-99

+ - Update to Ruby 2.5.3.

+ 

  * Mon Aug 13 2018 Vít Ondruch <vondruch@redhat.com> - 2.5.1-98

  - Properly execute entire test suite.

  

file modified
+1 -1
@@ -1,1 +1,1 @@

- SHA512 (ruby-2.5.1.tar.xz) = 31bacf58469953282cd5d8b51862dcf4b84dedb927c1871bc3fca32fc157fe49187631575a70838705fe246f4555647577a7ecc26894445a7d64de5503dc11b4

+ SHA512 (ruby-2.5.3.tar.xz) = 6dcae0e8d0bacdb2cbde636e2030596308b5af53f2eb85d3adccb67b02e6f8f9751e8117d12f8484829fdd9d995f6e327f701d9b433bcf94f1f59d13a1fd7518